am 705b37b8: merge from open-source master

Merge commit '705b37b84c0c13407963fb1cea0309b9c3081368' into kraken

* commit '705b37b84c0c13407963fb1cea0309b9c3081368':
  Fix adb remount on non-MTD devices