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

Change-Id: Iccca3f2b035d5f9317ce246629da4d711a70aa56