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

Change-Id: Ifbf7332ed0b9e8182fb6accc6c509cb805a53d4c