Merge "Rename 32-bit NDK window package to have -x86 suffix"