Merge "Extend vpxssim to handle more HBD combinations" into nextgenv2