Fix for ART build + add default
Merge branch 'master' of https://github.com/MinimalUI/android_build into HEAD