Merge 0a7f11f63324ffcb51fc5680b837481dfe76a85a on remote branch

Change-Id: I21747bcc7390bd05167dc6b53ab89661257de1e2
tree: 2add38bf9069755accee81cd1d74a7d57120a01b
  1. src/
  2. Android.bp
  3. CleanSpec.mk