Merge "Fix AndroidDevice.get_prop, add tests."