CirrOS Image Builder updated

Change-Id: I4fe9abcaf6703f18fc0fbf18b2d5998eb9597b9a