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

Change-Id: I01c05d5cf034988afa7fed8b875649232fa9fba7