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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b823a12eb90fd94f3671346b0487eee8c89be40