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

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

Change-Id: I6dc5ce295f72a1d23d5d9556277030be920ed559