mako: Fix default value of color calibration

It was merged without being discussed, revert to original value for now

Change-Id: I7b1a1cfa5390dc9a2f81b32e40f7992dbdd33207
mako: Enable use of FFMPEG codecs for extended formats

Change-Id: I87c2fd47e15bef8382e10351ba3afef62b68cba1
Merge remote-tracking branch 'CM/cm-11.0' into cm-11.0