am 6438e09b: am 903e390f: Merge "art: -Wsystem-header warning"

* commit '6438e09b493d5ab54f8a6feb47a20d11538a6c0a':
  art: -Wsystem-header warning