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