am 5ba213c2: am 3241e3aa: am ee5ce0d1: Merge "Fix "adb remount" for devices without an oem partition."

* commit '5ba213c2bd45ecab84f4a9b1661e65c5d362fe80':
  Fix "adb remount" for devices without an oem partition.