Merge 15b320f57cefc1b78e6c69294e75a56f395e529a on remote branch

Change-Id: Ia84f63719b3870e4de6c6eda87af93a437daf767
tree: b6f1189a3fc984d264f6f78a76d14e4480ff67b0
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. NOTICE
  8. OWNERS