Merge \"cpp-define-generator: \"make art-update-cpp-defines\" to regen asm_support\"
am: 4130c3360e

Change-Id: I034b4ad64c8298cec6a998cf2d3ddf11c1812d71