am 94e5af86: Merge "ART: Fix common_build CFLAGS"

* commit '94e5af8602150efa95bde35cc9be9891ddf30135':
  ART: Fix common_build CFLAGS