Merge "Remove APV Codec from OMX Component role" into main