Fix build for latest android studio