Merge "media: add hdr and color aspects metadata" into nyc-dev am: ccd783b48a
am: eb64ac64dc

* commit 'eb64ac64dc1f5987d9d47de7b35389b00a0aac96':
  media: add hdr and color aspects metadata