Merge 0145c06bae969f95bf54df9f798a945ed506096b on remote branch

Change-Id: I1c7c9ac1e1626ae8ab1606d3acfc28467d4592ae
tree: 81dbcdecc42ff879b2c0cc69ffb0cc8521ef4fae
  1. resources/
  2. src/
  3. tests/
  4. tools/
  5. Android.mk
  6. CleanSpec.mk
  7. README.txt