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

Change-Id: I4aefb843fcd71ca74e9913a195cf8475331d3175