Merge "Move runtime/ to ClassAccessor" am: df0eef1aec
am: 61afc76d92

Change-Id: I90111046530d4152ef08c26ace96dc2a3d96c7b3