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

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