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
am: cc741e96 -s ours
* commit 'cc741e96':
DO NOT MERGE SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter