Fix building with more recent android sdk/ndks (#2443)

Fix building with more recent android sdk/ndks (#2443) #2184