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

* commit 'b63f75be6dad1a973a1b74fee39b159a456c8010':
  Revert "Revert "adb: support /oem partition""