Merge "Revert "Use VNDK APEX instead of /system/lib/vndk"" am: 1324ac1552
am: 851427fb9d

Change-Id: I14071c6ae18b3d869ca990c94db4747d9e1f1bd9