Some changes into AssetManager and gradle config