Merge "Add support for dualbooting dalvik and art"