[Bug 226036] Merge Review: liboil