Merge "makefile: Add VB ATTEST and OSVERSION IN BOOTIMAGE flags"