Merge "Dedup stub jar build rules"