Make icu4c-android.patch apply again

Change-Id: I98d9fecb0f44b0b4354029bab1a5d675e98edd1f