Merge "adb: temporarily kill adb_benchmark." am: d6211a2dde

Change-Id: I8bf789ca5eef0cc43dc019e79f99c098eb85f6a9