Merge "goldfish: force cold boot in build env"