Updated headers for Android.