Merge "Remove retry routines from mixed_build"
am: a3229b0747

Change-Id: Ie9369cf99858bf86033c09bf6cd75bf4df3eef5d