fixing Android API util related issues