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

Change-Id: I71f560f184a6e3945978140dec55d7db6cd1cc1e