Add Toroplus to Nightly's

Change-Id: Ie30762a6c87e2649f5525d35eb5f066c6f6d989c
Revert to orginal otter dependencies that my last commit changed.

Change-Id: I5f6d5fc0820b9879ee5e3dfdfb8143216e8681a9
Merge pull request #12 from PAC-man/cm-10.2

Maj