am 54aa4e57: Merge "ART: Fix GenInlined functions"

* commit '54aa4e578a382977325d654d5ae1bd779d443fc8':
  ART: Fix GenInlined functions