Merge "Revert "cpp-define-generator: "make art-update-cpp-defines" to regen asm_support""
am: 1a827a05af

Change-Id: I86b8efd42582dde2406bc18b490f461fc0570f27