Fix Android build
There are some patches missing from 5.12.12 that are needed for the NDK to work again; Dmitry already found many of them while fixing the GCC 11 build, but there were two additional bits which are included in this MR.
Test Plan
Build Krita on Android. I tested this with the arm64-v8a ABI.
Formalities Checklist
-
I confirmed this builds. -
I confirmed Krita ran and the relevant functions work. -
I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!) -
I made sure my commits build individually and have good descriptions as per KDE guidelines. -
I made sure my code conforms to the standards set in the HACKING file. -
I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per KDE Licensing Policy.
/cc @dkazakov