Merge changes I55d0e1a8,I4d9a8776

* changes:
  adb-remount-test: do not brick devices that support overlayfs but do not use it
  adb-remount-test: provide additional mount details