Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev
am: 4e7bc119ae

Change-Id: I8bf6233fe843a13b0e49e6abc5bd490159442185