Merge "Include 64-bit version of libaapt2_jni.dll in windows SDK" am: 09b1e8e164 am: cc68faeb0b

Original change: https://android-review.googlesource.com/c/platform/development/+/1515805

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cfb47213ae7535f88ef6ce8cbfe5c1c00059bf8