Merge f15e9a77e593f305e526d9a79d09b92f4a77f2bb on remote branch

Change-Id: I7eb20dc2dd68ef4508bc3188b830b3664dfec882
tree: 83e29e5884e3b2546eba0fcae5fbb95f895ea51a
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS