Merge "Increase adb-remount timeout"