am 18b5264b: Merge "Revert "Revert "adb: support /oem partition"""

* commit '18b5264b9db5a53407446c3ef9e2c35c77830980':
  Revert "Revert "adb: support /oem partition""