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

Change-Id: Icd8e9f3b7d7fc0b6e40ea081e959ae9a8067eb78