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

Change-Id: Idbbf6b9535a250925d02d0190d6f28cdc8b961ba
tree: 03462dcbee4e1af11dd66d012a8f8c111ac2cf80
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk
  6. README.txt