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