Incorporating Smruthi's support for Android.