Update for Newest Android SDK