Reverted to Android plugin 0.5.x (because of some lint bug during build)