2.3.4: Workaround for Android Beta 11 configure bug