Merge 7d99934c96b272b15f28b59320dad026b4b8b9ab on remote branch

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