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

Change-Id: I82956abbb60fee7513d69ccbed994789294ee077