Merge "Switch APCT VibratorPerfTest to use Jetpack Benchmark"