Merge "goldfish: force cold boot in build env" am: 2d10d70571
am: 238b164a81

Change-Id: I4a60b29f51e5a8ae3334c08878a55027af4eda6e