Merge "cpp-define-generator: "make art-update-cpp-defines" to regen asm_support"