Merge changes I47bd6edc,I0e3e268d

* changes:
  ART: Small class-inl.h cleanup
  ART: More header cleanups