Merge "SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter" am: ebc0faffd2
am: c33a41e38d

* commit 'c33a41e38d414e3d2f0266d522ed42cdf7ac1e62':
  SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter