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 am: 573e35a085
am: 03ba73c478  -s ours

Change-Id: I309cd99e9a5700928edaaf259e6f6f040c10207e
tree: 87d575ec4c1c385cc8edcf6f2d40d3d841704faf
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk
  6. README.txt