Merge "Don't install unnecessary VNDK libs"