Merge "Don't try to make /system on device writable when syncing ART to chroot dir." am: d925742e6c
am: 23d6472ba7

Change-Id: Ic2f617f04f30d2110fdfc694f3095746d1ddfd00