Some "hopefully" correct prepwork for PitchforkOS

Signed-off-by: Anthony <Disciple3603@gmail.com>
Merge branch 'pitch-4.4' of https://github.com/Ice974/android_build into pitch-4.4

Signed-off-by: Anthony <Disciple3603@gmail.com>

Conflicts:
	envsetup.sh