Mako: Update torch overlays

The config in settings is deprecated - move it to framework

Change-Id: I1e0312b66bc4dc9b5c7189b7e7c191c53d5475a9
merge changes from CyanogenMod 10.2 into local branch
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2