Merge "Revert "Include 26.0 compat file on system image.""