Merge "adb: remount for /system as root"
am: c105f4b63a

Change-Id: I4930b1f88ce1c68a9736678683bc7c7738b0ddd2