Tidy up headers on Android build.