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

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

Change-Id: If5fab550c413bb8b3cd36c927420e7df31e40b77