Merge "releasetools: Make BBOTA incremental generation repeatable." am: b9bd78d110
am: e3554167e2

Change-Id: Ibed49f54635a10325f20163d63852f3833dbf9a6