Merge "Revert "Move runtime/ to ClassAccessor""
am: 5ab7d77cdc

Change-Id: Ief4bd06e4a3dfd563ada1aa2773820e6ca481a57