Merge changes If8e07502,I48c84fab

* changes:
  Fix adb remount on non-MTD devices
  mount: Add support for remounting without specifying device