Fix Android build errors introduced in 2d89ac8.