am 23d74231: am 4c04495f: Merge "SoftAVCEnc: Stop using the u4_strd field in the set dimensions struct"

* commit '23d74231963e2ca21384e06eec1962ac46d47ce0':
  SoftAVCEnc: Stop using the u4_strd field in the set dimensions struct