Merge 347f50fe604cc4f126d0c78828b4c06db8ee4133 on remote branch

Change-Id: Ic7ef672dc75ce6e11c9b5d452a9da6267e76c6e2
tree: 5a5a7697a4be8151f68c69a7c4c4ebc5d91897ff
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS