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

Change-Id: Id169034698eb26f03c4fd8b15da1b076b9c6a05f