am 65b50272: Merge "ART: Fix compile-time-init fail"

* commit '65b50272a15c52d753f68df2468fe1792f2516ea':
  ART: Fix compile-time-init fail