Merge changes I3f440a75,I5566a1ef into main

* changes:
  Codec Extensibility Base AIDL
  Upgrade VNDK version to 4