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