Drop two patches merged upstream. (From OE-Core rev: 1bc656bac3bccbedde407a52969dfdca7f5a3c2b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>