am a81fd294: Merge "Fixed ASM_ALIGN macro"

* commit 'a81fd294be55f8781dbf22f381a3335212d8dbd9':
  Fixed ASM_ALIGN macro