Merge "Remove retry routines from mixed_build" am: a3229b0747
am: 5c47b1d190

Change-Id: Id697e9b39b591ff34fbe63c1830e65e19c699249