Merge "SoftAvcEnc: Added support for Constrained intra prediction."
am: f125dacbe5

* commit 'f125dacbe505f97f4d8e051ecac49c571750dc95':
  SoftAvcEnc: Added support for Constrained intra prediction.