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

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