Merge "Clean up APEX-related `otapreopt_chroot` policies."