Fix for latest Android SDK.