Add Codec2 entry; make Codec2 and Omx optional am: 2dcd353f7f
am: 96da41e653

Change-Id: I79881e37c26b637cfb9b5adeeef6f87af924da77