Merge "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs""""
am: 35815917ba

Change-Id: I1a843901f0c97d89f37b90a503c908ee6fe51634