Merge "SDK Manager: support standalone sys-img xml."