Merge commit '39528d6bace1457d21e76824fe94d85c880fe4be' * commit '39528d6bace1457d21e76824fe94d85c880fe4be': fix the SDK build for real this time. support incremental updates of boot image