Merge b28ec0262f6938771387901d2079b48c8a6bc4c1 on remote branch

Change-Id: I450b0cfef198eef38443a798f0effd8d65b1ef51
tree: 857c06d175eb126d3bf461cad47007d867281814
  1. src/
  2. Android.bp
  3. AndroidManifest.xml