Fix to project following ADT/Android SDK tools updates