Merge "m7: set proximity calibration values on boot" into cm-10.1
Revert "m7: fix extracting of files in sbin"

This reverts commit 907b436ac2087479519934a148b4ff9024bacea3.

Change-Id: I1379236928f9d38f8f65066cda028fb29ab96838
Revert "m7: pulling files from sbin requires root"

This reverts commit 45475eee1b1166a299268c0168df6b460770e657.

Change-Id: I537923a928f9dd8f8f65566cda088fb29ab86838
m7-common: remove HTC diagnostic binaries

Change-Id: I4d020e1c9f6f317b6d0a3acb4c216fc2981c1e6a
m7-common: make proprietary file system dir implicit

Change-Id: I412b77d92cfe78e581c399d7c79a10b14a671ffb
m7: camera: fix focal-length parameter on back camera

Change-Id: I5d2b88ce17b7318c4733e4951faa4f1ab4f5e8f1
m7-common: snd_soc_msm_2x: fix tunnel usecases

Change-Id: I12e282506d9738cab028b0846d47ffc9bc2a2f5e