Merge "ART: Fix some -Wpedantic errors"