This reverts commit 751c083f. Our buildbots need to be upgraded to a newer version of the Android SDK.
