am 82d974c7: am a81fd294: Merge "Fixed ASM_ALIGN macro"

* commit '82d974c7ef88f7f796794f2417dd707cc5be6a9c':
  Fixed ASM_ALIGN macro