Merge "Fix the build system to pass "-Xgc:CMC" to dex2oat correctly."