Merge "Increase adb-remount timeout"
am: 66b0c31f60

Change-Id: Ie01b3527fb97d722f5f94fdb9be67269d7623699