Merge "Cleaning out media references in include_dirs"