Merge 66ccd860ddcc5cedc26a387a6e57e66feef70991 on remote branch

Change-Id: I796a9c6c48ecede8afe4a49ce8f3ac11bdc79eb0
tree: 37eb7bef1a345db932b3c8eb56bfa1b30e8e2eeb
  1. resources/
  2. src/
  3. tests/
  4. tools/
  5. Android.mk
  6. CleanSpec.mk
  7. README.txt