Update scripts to support both Grizzly and Havana, Icehouse.

Change-Id: I9e7f8122d9e780f281bddb4dc9040e1fd3005511