Merge "Fix perf build."
tree: 3f8bb281487caae5b4965bbb90057db09cbba161
  1. src/
  2. android-fixes.h
  3. Android.mk
  4. CleanSpec.mk