DO NOT MERGE fix build breakage am: 2b4cff6935
am: 1173aa0fc1

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