Merge "adb: temporarily kill adb_benchmark."