Minor fixes to pull in correct version of device repositories

Change-Id: I44b0b6b6e81b8d130f751cb581f0002393c08610
Signed-off-by: Simon Busch <morphis@gravedo.de>