am 1fba48e4: am fa3622b2: am c0e8d0fc: Merge "Fix AndroidDevice.get_prop, add tests."

* commit '1fba48e4f8b02ec09067528a3cf1ce35391d03e2':
  Fix AndroidDevice.get_prop, add tests.