Merge "Properly mark the type for ARM assembly functions." am: d273b2ca69 am: 7e7631299c

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

Change-Id: Ib37f194f69138fd4ce6791fff772f1753013b97b