Merge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""""