Fixed for new android studio version and "android-L"