Merge "MediaCodecInfo: keep capabilities from XML when updating them from codec" into nyc-dev