Merge ed7503b807dc1986370f918f5b41f7093535bb77 on remote branch

Change-Id: I62ae741bfcafebe9b5317269d38d058235154f51
tree: 3381a5acfe572dafa865105a737b62abf0080683
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS