Staging compatibility updates for Android.