updated for android studio 0.8.x