Merge fabefaf089af76adce623d70dc864a7850cee60c on remote branch

Change-Id: I21e189166444b408bc3b7e0be3ba122b1ae763e2
tree: 7ebd3a0e548f12c7d7af8c22c68170bdf674f2b8
  1. src/
  2. Android.bp
  3. CleanSpec.mk