P3100: Update PRODUCT_BUILD_PROP_OVERRIDES

Match Stock 4.2.2

Change-Id: If90cdb71aa489e5d657509b8b9121905bde0e254
P31XX: Build Swipe-Recovery by default

Change-Id: I710ae16f85f856c5b3d1fd1addccc3e48e90f86d
Merge remote-tracking branch 'upstream/cm-11.0' into carbon-4.4