[automerger skipped] Merge "Don't use SDK variant for vendor JNI libraries" into rvc-dev am: 3fcdb81cf2
-s ours
am skip reason: Change-Id I21ba67e8e9fb05016caf5888129adc1a939545c2 with SHA-1 c2d24050c5
is in history
Change-Id: I2b7131a44cdc136517163eb81c79061c3dd9c036
This commit is contained in: