Merge changes Ia8f9e872,Ie7801651

* changes:
  codec2: support gralloc4 metadata
  codec2: add HDR dynamic metadata info