Merge changes I632b501e,Id97f12b4

* changes:
  Minor cleanup of AccessibleObject
  Move support files back with DexClassLoader and PathClassLoader