Add HTC Rezound (vigor) to PAC
Urushi & Haida: Disable AOKP torch toggle
It gave issue while it on & goes to lockscreen.

Change-Id: Ib6a19f944151675affbce8f73a5f0cb4acbfc10d
Merge remote-tracking branch 'upstream/jellybean' into jellybean

Conflicts:
	vendorsetup.sh