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

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

Change-Id: I7e254fc837d6165dd69948e8a95e3812a3940209