[automerger skipped] Merge "Don't use SDK variant for vendor JNI libraries"...
[automerger skipped] Merge "Don't use SDK variant for vendor JNI libraries" into rvc-dev am: 3fcdb81c am: e4c78256 -s ours
am skip reason: Change-Id I21ba67e8e9fb05016caf5888129adc1a939545c2 with SHA-1 eb03296b is in history
Change-Id: Ia23c7fc66a88da9ace28931ee4f6b1fe5e5c2bd2