Merge "Revert "Revert "Move runtime/ to ClassAccessor"""
am: 6ed28cb9e6

Change-Id: Ifb8f55d11d486fe3f9c7e5609bbfd764b5cb6734