Merge "ART: Fix common_build CFLAGS"