Merge "Fix issues with ARM/Thumb linking." am: 0e9adf2d4b

Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/1487216

Change-Id: I0ac64d5cfe35474fbec8ac2c035595ea65705193