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

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

Change-Id: Ia055719035a7cfb91b93934d76a4cb9099c56a85