Merge 5875022d44c619fbd1917546c727502eea24a98f on remote branch

Change-Id: Iaec8ef81ed75863ddc89312d1d33080421f4a12a
tree: e351715ed29b3376b947764b3cc8c0925853d894
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS