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

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

Change-Id: Ib93c20d473221ab221e2ce37d9bfb0b6ce383bc7