Merge branch 'kk4.4' of https://github.com/BlakKatRom/platform_device_htc_m7spr into kk4.4

Conflicts:
	bk.dependencies