Merge "Fix ARM assembler for clang." am: 117e943be6 am: 4af13a244f am: bfcb0e4589 am: 624b01674c am: 04b9357b41

Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/1691219

Change-Id: Ibeab5a4e563be2dd64742a6abb3943ec3e1a449e