Merge "Fix case-sensitive comparisons of Android/media" into sc-mainline-prod