track cm-11.0 branch of kernel

Change-Id: I9e98e9fb9034b81c9264d7a24d17f05d63c1d846