[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 am: 314d7b31 -s ours
am skip reason: Change-Id I21ba67e8e9fb05016caf5888129adc1a939545c2 with SHA-1 eb03296b is in history
Change-Id: I9783bf4e4650fb4f0ab2249e6bd3a69bf70d60b5