Merge "media: Add colorAspect support to SoftMPEG2 decoder." into nyc-mr1-dev