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

Change-Id: Ia15a7ea301c489653f3f95356328248b27da293a