Merge "media: add media.codec flags" into aosp-main-future