Manually merged patches from meta-fastboot

Signed-off-by: Sean Hudson <sean_hudson@mentor.com>