Fix error caused by .95 patch

Change-Id: I35d6837e45273a72def4cda15267def5ba81a494
Update to 3.4.96

Change-Id: Ib1959e63edd9aa21adb1cef6301dbe85c8a775ab
Revert "Fix error caused by .95 patch"

This reverts commit 7c4806e859ba5b71fc454e19ecbafd6805c5adc1.
Merge branch 'daeiron_bridge' into rojak_cm11_mk2_wip