Merge commit '4fdb7d88ef83e1206e4f34f50ded213366f2a5ed' into HEAD

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