Merging jf-kernel stuff for CM11

Change-Id: I12c6dba5270fd5d5c7ed464832b610dabe69d382