Add torch back

Change-Id: I52e16945c5b81e8b1d8e93b2c3e602cc32530381
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge "Add torch back" into kitkat