Merge "SDK emulator: support relative path in avd root ini files."