Remove special android includes until we know they are necessary on the latest NDKs