also remove unused files and force-fix errors using pocheck Change-Id: If95f38febdf34951193d67b1eb7a8fbfd292474d
Change-Id: Ic18845e0513f551cdc4152dd69fc54b0a14f2e6b