Merge "DO NOT MERGE SoftAvcEnc:Configured constrained_intra_pred flag in...
Merge "DO NOT MERGE SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter" into nyc-dev
am: f886997e
* commit 'f886997e':
DO NOT MERGE SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter