The tags do not have anymore "based" added to them, remove it from our script so that building uses correct tags. Change-Id: I72a0bb48a96481fce4b1a83b2aecdbf86c1a0831