Merge "Clean up old file-based OTA SELinux rules"