uncomment AOSP devices and some HTC
Conflicts:
	vendorsetup.sh
Hammerhead edits

part thirty five and one quarter