DO NOT MERGE fix build breakage am: 2b4cff6935 am: 1173aa0fc1 am: 29668a1dc8  -s ours am: e860c6d3af  -s ours am: 8174a6d16e
am: 4f6d4c52f8

Change-Id: I5c286f294cbb032c67b0de78d6f1bdc2fcce5601
tree: 9d01b823b87b4ebe41bcd754491fb2130f665f5e
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk
  6. README.txt