Update art and dalvik branch