am 41ddac8d: am 48e9dbfb: am 5788769d: Merge "Revert "Fix ODR issues in ART.""

* commit '41ddac8dd304faa58363082c52d3630dc4d381b0':
  Revert "Fix ODR issues in ART."