am ddd7c919: am 5e9a2033: Merge "don\'t rename 32-bit packages to *_32"

* commit 'ddd7c919d243bb73ce1590463af18c0f0f05c95a':
  don't rename 32-bit packages to *_32