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

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

Change-Id: I745e3017145c7094ea280a05ef04dfc2137ed007