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

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

Change-Id: Idd09cd2ecd3045625f3c10c41cad2f2af7850dd5