Remove torch from build

Change-Id: Id5bf086c2a8d7314539fff61725048370b66e7e8
Fix tablet makefile

Change-Id: I8e8d0195269901cdfb8be3d5f246923461a80e59