Merge 35add43f36718a55b887bf95d28be796fa5fc8d0 on remote branch

Change-Id: I2011de4e0f0613b442ce5bd99b71a328669a78ff
tree: bc524e8095bede9b190b597926f2a04209e871f7
  1. res/
  2. sample/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml