Merge changes Ibb4dad3a,I6eb1ce89

* changes:
  codec2: move static libcodec2_vndk dependencies into a default
  Codec2: Support locking vendor formats with gralloc4