Merge "adb: support /oem partition"