[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: 7be34b51 -s ours

am skip reason: Change-Id I21ba67e8e9fb05016caf5888129adc1a939545c2 with SHA-1 c2d24050 is in history

Change-Id: I82746eae8b4c0abc8807a30c81d30937df543704