Merge "Revert "Revert "adb: support /oem partition"""