-Refactored for android-tools change