Some changes to support Android Studio.