[[ Bug 12719 ]] Backport Android SDK zipalign fix to 6.6.4