Fixed (hopefully) to be back to working after android studio 0.3 update