Merge b22e03995ff0bc15344f55ea8c2fe9fd0eec6fa0 on remote branch

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