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

Change-Id: If235bb31a909e72673493d7bd192b3ec03b46818