Merge "JankBench: make it build and run in Android build"