and force-fix errors using pocheck Change-Id: I47e8da2f3c05fe79e9d5f79b5e1be051f479d567 (cherry picked from commit 624987b5ec5daaf270b065048dcf11f487edfd4d)
also remove unused files and force-fix errors using pocheck Change-Id: If95f38febdf34951193d67b1eb7a8fbfd292474d