Allow DISPLAY_VARIANT to be overriden by device/family mk files

Change-Id: I1a138d12dc706ef729f4c4fdb07c9bbbd5ec31a8
Refactor recovery build options

Change-Id: Ifa10c9a936b0fe11bb99f5be73da6bf4aaa7c647
Move charge_only_mode package to msm8960-common

Change-Id: I3c6f8a9332b06c0bac680aa4893cc5f28392484f
android_filesystem_config: Add entires from X system_core drop

Change-Id: Ib2018020ba865a22b6c13cdd7a0af3e5f22b94da
overlay: Move storage and powerprofile to family tree

Change-Id: If1215543f9a4accc10463826405e8cda10e6fee1
include: add device permissions overrides for X

Change-Id: Id2dbaab680e66de0b55eeb096374dc3c2c29ab5e
Move camera wrapper product to family trees

Change-Id: Ie9e080c6c0c7c5956a441830ae7b97585fe44ead
Revert "torch: use camera interface"

Enabling torch flash via camera interface is too slow.
This reverts commit be772fc5e15f9d573ac0c5232aeda964bf76661c

Change-Id: I5ace0341832f426ec74159227dd49943bddb87f3
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2