m7vzw: t6: update to lollipop branches

Change-Id: I309041efdb10b6a852bd15f019f1aa69805f236d
Merge "m7vzw: t6: update to lollipop branches" into pac-5.0