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

Change-Id: I5448dfee5493b286c8ecefacd7671ff30e796bdf