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

Change-Id: Ifcc96ebdc19c863dbd9a4e67376e31aabdd6b32b