Merge "Revert "Arm32 dynamic function dispatch""