Update Apex Launcher
Add toroplus
Merge remote-tracking branch 'upstream/jb42' into jb42

Conflicts:
	products/AndroidProducts.mk
	vendorsetup.sh