Merge "adb: overlayfs failed to remount /system"
am: 7d87981f79

Change-Id: I43914da62555f60c75e6bbe6e4d6f58ce86c97a0