Partial revert of 4.9 hacks

Signed-off-by: Hieu Phan <aznrice2k4@gmail.com>
sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c: fix warning: array subscript is above array bounds [-Warray-bounds]

Thanks Dennis for helping (95%) in fixing it

Signed-off-by: Hieu Phan <aznrice2k4@gmail.com>