Merge "Prevent vendor libs from depending on private VNDK libraries"