Currently this function assumes that no multilib is applied and that
we're applying a multilib. This means if we're in multilib context
and want the non-multilib context we can't obtain it (and no other
function exists for this either).
Improve the function to allow this to be requested.
(From OE-Core rev: 295c5a3d19834a2fac255346d0a373449cfdd776)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>