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

Change-Id: I2204d9e9deae233cf827b4b71ee950360bc433bc