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

Change-Id: I7f6b755f800a2f51161d42d5676184616d3ab775