Merge "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""" am: 4125e37c3b am: 5f534a9feb
am: f383bad166

Change-Id: I1137f020395f6944d6505fa6056601a91e28a0e2