Merge remote-tracking branch 'refs/remotes/brx86/r11-r17'

Change-Id: Ibf0f06ef60a35eae10648ae08bdfb28546f396f6

Conflicts:
	build/tasks/kernel.mk