Patch merged into coreboot/master: cbfstool: Fix broken alignment because of flashmap

the following patch was just integrated into master:
commit 95bfcaecf9c054bd116b7f36339f8de595026f28
Author: Werner Zeh 
Date:   Mon Jan 25 12:47:20 2016 +0100

cbfstool: Fix broken alignment because of flashmap

With the introduction of flashmap cbfs alignment of files gets
    broken because flashmap is located at the beginning of the flash
    and cbfstool didn't take care about that offset.
    This commit fixes the alignment in cbfs.

Change-Id: Idebb86d4c691b49a351a402ef79c62d31622c773
    Signed-off-by: Werner Zeh 
    Reviewed-on: https://review.coreboot.org/13417
    Reviewed-by: Aaron Durbin 
    Tested-by: build bot (Jenkins)
    Reviewed-by: Patrick Georgi

See https://review.coreboot.org/13417 for details.

-gerrit