am e4a1bd60: Merge "Fix perf build."

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