Issue/android studio 0.9 compat

Issue/android studio 0.9 compat