am 805fbf31: am 36b111c7: Merge "ART: Build fix"

* commit '805fbf3182e1835507558c678c477ac56e12aa52':
  ART: Build fix