pulling latest changes from torch-android