Merge "Fix assembly code for clang's integrated as"
am: b06addc841

Change-Id: Ief412ee8fc6a2ef01d70b3bacf40fae401757c77