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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37f8c7fb7a105febd498493f70fddbef2dab148e