fix merge derp from cm kernel update

Change-Id: I9bab00ac656d15bd44cce03e26048283a032341e