Fix GlobalConfiguration parsing

When reaching the end tag of an object, GlobalConfig
should like regular configuration, close the object to
avoid adding unexpected Options to it.

Bug: 28588072
Change-Id: I7a3256fd76c1a2988f9fc6c2cef18ccf899892d5
2 files changed