Merge "Move runtime/ to ClassAccessor"
am: df0eef1aec

Change-Id: I30f38bc26e10da40e1f1adf6002773037ae32b84