Remove 2 reundand jobs, decreasing build time by 1/3

Change-Id: I82dc4669b3c76ce8c9293174eba8e9271385bc30