Quicksettings: Correct alignment.

* Fix issues cumulated during quick settings rework, restore android behaviour for margins and ditch empty views (that were applied only to basic constructed tiles).
* Wrap battery views into a separate parent layout so we align only that one that contains both.
* Clean circle battery sizes calculations and ditch inside padding for external margin (derp).
* Increase dual switch area a bit, since is an overlaied view is fine does not affects margins.

Before:
* https://drive.google.com/file/d/0B2UbDLX5_0AjWkFmcEtKN3hJcHM/edit?usp=sharing
* https://drive.google.com/file/d/0B2UbDLX5_0Ajb1F3MWw4UjVpYzg/edit?usp=sharing

After:
* https://drive.google.com/file/d/0B2UbDLX5_0AjY3ZvUm54S1ZURGc/edit?usp=sharing
* https://drive.google.com/file/d/0B2UbDLX5_0AjUXJrMlpTSlpVLTQ/edit?usp=sharing

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat
CamcorderProfile: Add 4k timelapse encoder constants

 4k encoder constants during timelapse are added
 for the 4k timelapse use case.

CRs-Fixed: 642013
Change-Id: I901fa362242477dad84130d23055815cdfee6167
Merge remote-tracking branch 'PA/kitkat' into legacy-staging