Merge "adb: Only use properties on device builds"