Remove OTA from build, Add Torch

Change-Id: Ib20a678b50848e60e9f6a6d2566e2b9258f2ab1f