Merge d63da3e060ec549dc7a0e211e0ddb793f1d02fa8 on remote branch

Change-Id: Id72c49fd1ecf2328941744a1de28fcfc8402d7e2
tree: 12ebe2b71a6125b4e154b011283d4e69127fb91e
  1. src/
  2. Android.bp