Merge "Revert "goldfish_nand.c: Change sizes""