Fix two more build issues caused by greatlod's d3d header change and ndk bug