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