ToUpstream: misc
ToUpstream: misc
ToUpstream: Add zipalign feature

Conflicts:
	__dont_include/build.sh