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

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