Merge "Restore security context of `/postinstall/apex` earlier in otapreopt_chroot."