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

Change-Id: I7cd201b238f50ada73fa0a32bfc2e9acc99d0435