Merge "Fix otapreopt_chroot"