Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 1320192e5d am: 42b4b242f7 am: acf0078d3e

Change-Id: Ia4c804083f6b0db47585aa6491a8c36c4c8ff0aa