am 00ade1e5: Merge "ART: Fix some -Wpedantic errors"

* commit '00ade1e5eb76318790aad096ded1b7c4e9638785':
  ART: Fix some -Wpedantic errors