Merge "reduce the visibility of framework-minus-apex" into rvc-dev am: e06e29bb am: 9138b8de am: 27f11d77 Change-Id: Ide62faf3e5d383d70ab38c908fca23b72f644922