Add Android 2.2 compatibility