DO NOT MERGE fix build breakage
am: 2b4cff6935

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