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

* commit '3241e3aace657865052a1890ef411e5d2aa2d34b':
  Fix "adb remount" for devices without an oem partition.