Updates for Android 5.0 build