am 5f6f2a72: am b0aeeb77: Merge "ART: Follow-up fixes"

* commit '5f6f2a720decdfffeb75b0300a05f03beabe9bf1':
  ART: Follow-up fixes