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

Change-Id: I9e75c25de3d2371ce9d6ba589d56aefb18ead2fe