Merge "Fix google-explicit-constructor warnings in media." am: de9d105255
am: 4b2033ca3a

Change-Id: I1aac222881725d729f6d8db9b8f22e9c096ead1b