Revert "Revert "Fix for ART build + add default""

This reverts commit 54d12d24d2239e7ed3b7ab08c023b309300e5c90.