Merge \\"Replace .align with .balign to avoid ambiguity\\" am: 78ea54f735
am: b36ebd0593

Change-Id: Ia4bb3224180a00680a24cf66738d7fde115d524b