Merge "Embed jni libs in vendor apks for treble-ized devices" am: 5aada52ffb
am: 7423f3ab11

Change-Id: I0914d19415abb366a147e51a4eb5deefea4a2b6c