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

Change-Id: If5e8fb588de2753979ef34db8d44ab381e23be37