Merge change 26292 into eclair

* changes:
  Increase reusability of zipalign macrodef