Merge "adb-remount-test: Refactor prologue & /sys/module/overlay mining"