am 68e22f3b: Merge "ART: Some runtime cleanup"

* commit '68e22f3b982ff9ccbdfb3b65b7cfc16fcae907ba':
  ART: Some runtime cleanup