Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53 am: b3b8f40b Change-Id: I8ff6bb1b049f96d71612020adccd8c4a6888c178