(based on the 4.3 translations) and force-fix errors using pocheck Change-Id: I64547fd1d137a0bfa7bd4a55e8a547a7845faf96
also remove unused files and force-fix errors using pocheck Change-Id: If95f38febdf34951193d67b1eb7a8fbfd292474d