Revert "another fix"

This reverts commit be3ccae68e05fbf3c11082bf4588b583e9d61b34.
Revert "revert art & Dalvik"

This reverts commit e36746c337a9c71d2b876956992c647eb728988a.
Update default.xml
Fix Vendor