Merge "Revert "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""""" am: 097dd3b20c
am: 3e04079e12

Change-Id: I5346f9cc53a8ac7823ef4cb214685ad7a4adaf12