Fix build failing due to updates in media-caf in cm