Merge "media: add MediaFormat.COLOR_ IntDefs" into nyc-dev