am 18c07042: am e4a1bd60: Merge "Fix perf build."

* commit '18c07042d6d5c297336dd057c5edcd11c44237cc':
  Fix perf build.
tree: 3f8bb281487caae5b4965bbb90057db09cbba161
  1. src/
  2. android-fixes.h
  3. Android.mk
  4. CleanSpec.mk