Merge "Restore public __aeabi symbols"