Revert "Revert "Revert "GPU: merge with CAF kk_3.5"""

This reverts commit 7f4739278609317bde485ff458268b5da5aee2f1.
Revert "msm8974: remove HTC's ION and KGSL logging"

This reverts commit e0788d0b8af699c22f1680da165bb5d5ec92e662.