Merge "Fix ARM assembler to work with clang's as." am: c2d40e53e5 am: 16873a6b40 am: 5943036c6e

Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/1692372

Change-Id: I76f38674e7dbf8de77f05f2b44f2050e39000778