Merge remote-tracking branch 'u-boot/master'
lib: zlib: import trees file from 1.2.5 Signed-off-by: Lei Wen <leiwen@marvell.com>