Fix issues with ARM/Thumb linking. am: 69f526b9bd

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

Change-Id: I7b4f796a596baa0c6afd5676f0cc77b47f3b5d2c