Merge "Revert "embed incremental build number in jar manifest""