Add ability to build separate fs images for ubuntu

Change-Id: I650052154fe7b483aaba89389e9a09f80fc1543e