Merge "reduce the visibility of framework-minus-apex" into rvc-dev am: e06e29bb am: 74407fc6 am: 496e9578 Change-Id: I70d237aed00714b3c59fbd7e190a1a2ebd9f2d08