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

Change-Id: I7c1e9ba5f7dc05f0ba65ee4db4425f7ba256e00e
tree: 5981cdfae5e7db64de2d7320542a3e3789669ce6
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk
  6. README.txt