Added support for Android 2.2+ devices

The PR shows some repeated additions/deletions, that's due to Proper formatting of the code :)