Use VNDK APEX instead of /system/lib/vndk am: f5f85e3619
am: 265a52eedf

Change-Id: I123e1554ef4d9b8723fb3ddb9eb95ac9961a9325