Build: Fix build errors since ndk version r8e

(cherry picked from commit 4315152eb9b007996b022e31e3e5be80d7106e00)