Merge 152e2a9e3bf0bc852fd843e8d66e7c5d8b85602d on remote branch

Change-Id: If4cbef8fd987043e172a463a6b519e0f6ae11e41
tree: efc3d4258cbc76e12e20cef52aa73c00ef8c85c2
  1. src/
  2. Android.bp
  3. CleanSpec.mk