Rebase some patches (From OE-Core rev: 4cb22ea0beb952a5d70f83aaac415b7f2ecf3fd5) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>