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

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