Merge de74db90801ed4c3723de40e6718f45f83cdc64a on remote branch

Change-Id: I2c345f53c965bd346a78dc50fd6b7f7ec105757f
tree: 9b2dded3574b1738ac3f8dca1afd6dd6171230ad
  1. src/
  2. Android.bp
  3. AndroidManifest.xml