Fixed remainder build issues...

Going to figure out how to get the script to stop running release tool twice...

Change-Id: Idc07ac79953c1c9c392aa585b3f3f82d4875304e