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

Change-Id: I432372272d6a7658340c63aecc1daec6e2855b4e