Merge dd275b918aa801b86bbb30fa9dfacfab32d60b24 on remote branch

Change-Id: Id81beaa493764dbd102210c5b66c73b914cc8077
tree: 2b393083d369c0e3d37eca44e936e802c5306b12
  1. src/
  2. Android.bp
  3. CleanSpec.mk