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