Merge "adb/test_device.py: fix finding md5 command on pre-L platforms" am: a80834e943
am: 39dcda2619

* commit '39dcda2619f9401441dc0d6403ea5663e9612b88':
  adb/test_device.py: fix finding md5 command on pre-L platforms