Merge remote-tracking branch 'upstream/kk4.4' into berserk

Conflicts:
	tools/releasetools/ota_from_target_files
Merge branch 'berserk' of github.com:berserkaosp/android_build into berserk