push to 6.3

Change-Id: I1618dfc27236ae971ea47e066204bea4cdc95e31
Fix derp add C Spire

Change-Id: Ibeb8aac4ced8126c72e62ce9e88f8d20576fe488
Merge remote-tracking branch 'upstream/kk4.4' into berserk

Conflicts:
	config/common.mk
Merge branch 'berserk' of github.com:berserkaosp/vendor_berserk into berserk