Merge "Fix google-explicit-constructor warnings in media/mca." am: 2cace65f71 am: 4836d07980
am: edd824b94a

Change-Id: I83d815f5d739c47407f3faf1b25034e52492d638