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

Change-Id: I437537404e25a7a817fc5913ebf22b59e445c28c