Fix media playout on 8974

Yeah, we need the venus color format on recent platforms, and
I can't reproduce the clean_headers conflict...

Change-Id: I47fcaea999cce01c29681c7acdf456a12785a34e
Merge remote-tracking branch 'cm/cm-10.2' into HEAD