Merge "Embed jni libs in vendor apks for treble-ized devices" into oc-dev
am: f99f37b243  -s ours

Change-Id: I49ecd0cde24f927c9cadd2ef2e5486c6edbe5e91