Merge "media: changed resource type from String8 to enum." into nyc-dev