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

Change-Id: I13c0e04dd19b560132f4434ad7b7c8fd2db97adc