Merge "releasetools: Fix the computation in ReviseStashSize()."