[automerger skipped] Merge "Use sdkSpec to compare sdk_versions of APK/JNI"...

[automerger skipped] Merge "Use sdkSpec to compare sdk_versions of APK/JNI" am: 8a624337 am: d8b3df07 -s ours am: 76da2107 -s ours am: c3d46482 -s ours

am skip reason: Change-Id I2c4dbb79ae8712004dc3a9e647aa53cd5de7b508 with SHA-1 9d2c0f7a is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322146

Change-Id: Id0cac709ca703d49a8e8c141d65dc930775ba69d