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

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