Revert "import 9.1.B.0.411 sources from Sony"