Change the ARMC macro name and improve the code.

Na Zhangrequested to merge
Cynthia/ECM:ARMC_OPT into master

Merge request reports