Fix build with latest android studio