[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 -s ours am: bbaeb8d1 -s ours
am skip reason: Change-Id I21ba67e8e9fb05016caf5888129adc1a939545c2 with SHA-1 c2d24050 is in history
Change-Id: Iadcb22678d93be16d10cc8d41b83ba97a969a3fd