Merge "Don't install unnecessary VNDK libs"
am: 2fdf9da669

Change-Id: Iac44f8662cd1d0adcfd11515945d678a9a82e346