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

Change-Id: I3d36b388efaa5c5710b9d2ff4fdec6d2a8696613