am 7330d304: Merge commit \'eb7d144424aae66b25737a8d8791d192c980d86b\' into HEAD

* commit '7330d304407448eceababbe4772253b135674f27':
tree: b0a4bcf613997c5bc643d092a61381fbcb638dd2
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk
  6. README.txt