Merge "SDK: Relative AVD root path."