Merge "Fix google-explicit-constructor warnings in media/mca."