Updating build tools version for new android studio and path for mc-android-oem project
Merge branch 'master' into gradle