Merge change 25163 into eclair

* changes:
  Replace -no-sign and -debug-sign with macrodef attribute