Merge "Restrict visibility of stubs libraries"