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

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