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

Change-Id: I0b42a86541f7a6b31dd53cd5e3eacc4053ed1c60
tree: 64ca051b3d1837e693b1aea9fd1d18434d2bf024
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk
  6. README.txt