Fixes for system-image Ubuntu Touch install process

Change-Id: I6c2ced00f3731df2a06faf31fba128837133e8fc