Merge "Revert "Use VNDK APEX instead of /system/lib/vndk""
am: 1324ac1552

Change-Id: I2deacb5c3469e2c1ba65598c6e8682b7768e6248