Enable Torch
mako: Specify the socket name for PowerHAL

 * Current code in AOSP points to a new location. The socket name is
   hard coded in MPDecision, so let's compensate for now.
 * We can revert this when Google releases an update that brings it in
   line with Flo.
Quick settings: use 4 columns
Quick settings: go back to 3 columns.

Revert "Quick settings: use 4 columns"

This reverts commit 7fd66149a3a7e92010b1b1f573cbc572fe94c1f5.
Merge remote-tracking branch 'upstream/jb-ras-mr2.0' into jb-ras-mr2.0