am 1fd2ab38: Merge "ART: Fix inline dependency"

* commit '1fd2ab38033473d10be8df916804e8ab741e6f5a':
  ART: Fix inline dependency