This decouples modules from frameworks/base, and this repo also has a different automerger strategy. Add //frameworks/base/apex:__subpackages__ to the defaults_visibility to preserve the existing behavior. Test: m Merged-In: I1cf8cbbccf042a8503bf751ab057742cca357585 Change-Id: I1cf8cbbccf042a8503bf751ab057742cca357585