Update Term.apk location on github for ICS

Change-Id: Ic96eb2875635f07429e7a7dd80b5abda7130d848
Adjust vendorsetup to current build target location

Change-Id: I49a3673998786834d6e253ed3e7f0daff8f20109
Merge remote-tracking branch 'cyanogen/ics' into ics