Merge 0fd8681c2474ece71579dab5eb1fbe2eca07386b on remote branch

Change-Id: Ie3a2f45a90a16ce81c5268c12ac098ff4af72a07
tree: dc910e6964d46048775869d290dd8953378f5a54
  1. src/
  2. Android.bp
  3. CleanSpec.mk