Theme Engine [2/8]

Conflicts:
	main.mk

 Author:    BigBrother1984 <stevewatersy@gmail.com>
oneplus to vendorsetup.sh

Change-Id: Ib1b79aed35cb04163c8fd258b7f1aecd8150ca9f

Conflicts:
	vendorsetup.sh

 Author:    cordell <cordellsmail@gmail.com>
apns-conf: Update TMO HR APN

Can't get LTE otherwise.

Change-Id: I2c2593626f9633885a3fd3ab3146d1221860fcee