Merge "Fix visibility rules now that Make supports visibility checks" am:...

Merge "Fix visibility rules now that Make supports visibility checks" am: 48d272c7 am: ce53427a am: 24499f38 am: d2050453

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1324639

Change-Id: I689819cb8f1cb12c8e621a33d730467e4152e571