Reconcile kgsl w/ cm

Change-Id: I4b5fde6418c795c3dba350c35d03272ae3089ebb