Merge \\"[mips] Resolve issue with .align directive, when using clang IAS\\" am: 6b82eec610
am: 79233b4169

Change-Id: Ibfafe7c1b67c8b937a30ce1aebad05c895bfdacd