Merge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""""
am: 54de6a01ed

Change-Id: I75ef6ecc7564c457dcff265694c552a6766c2ff0