Merge "Make U-Boot compile w/ GCC 6.1.1"