Removed android 5.0 fixes