Merge "Don't increase image sizes for the release tools." into honeycomb