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

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