Remove AOKP torch / rename CM torch

Change-Id: Id530b4af7c81609e1a61d6d32b0baac3f353b720