Partial cp of "Prepare role code for modularization."

This keeps MainThread building against core_current.

Test: m framework-annotations-lib
Merged-In: I74f20b37d23370e258e7fc7130e28c5312abf46c
Change-Id: Iaa9833a5615c80b58e64975d4f0f0e38a5e76a3e
1 file changed