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

Change-Id: If5712c40fbf0057d7fce7059e270bf435342392c