Merge \\\"Fix google-explicit-constructor warnings in system/media.\\\" am: 5522a916cd am: 465a9f5c1a
am: b91f90ba9e

Change-Id: If6c1a273ef9ff5e4665ad2e1ebebcb02c84961f2