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

Change-Id: I376ac90b2e89757bc79ec57da5ce93fc3f2cd407