Start fixing Android app to make it run on >=2.3.3 devices