* Fix for the new android studio versions (0.6, 0.8)