merge with main
 Merge https://github.com/brymaster5000/B-Team_AOSP

Conflicts:
	.version
	ZipTools/kernel/zImage
	arch/arm/include/asm/rwsem.h
	block/sio-iosched.c
	block/sio-iosched.c~
	include/generated/compile.h