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