Merge "Include 64-bit version of libaapt2_jni.dll in windows SDK"