am cfd48d77: Merge "Rebuild quick settings tile layouts." into jb-mr2-dev

* commit 'cfd48d77a2d11324ce8641a9cc178fb9f12500a3':
  Rebuild quick settings tile layouts.