Merge "DO NOT MERGE SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter" into nyc-dev
am: f886997e55

* commit 'f886997e5528d30386f4973a57a09cf531042b77':
  DO NOT MERGE SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter