monarudo: camera: downgrade msm_actuator_cfg_data

Our proprietary camera libraries are using an older version of
this structure for ioctls.  Since we aren't using the new struct
members anyway (they are already #ifndef CONFIG_MACH_MONARUDO)
it should be safe to remove them entirely from our build.

This seems to fix the camera focus problems (and probably some
other problems that I don't know about).

Change-Id: I11b650c8671e71a19fe93743486878a7e205af88
Revert "net: wireless: bcmdhd: Enable p2p support bits for p2p device"

Breaks p2p.

This reverts commit 81ae7cc880350dd15aac69fa3dba1d98a966ca48.

Change-Id: I3706c429dc0a1a4c2a22643429bef23bff6005ec
Merge "Revert "net: wireless: bcmdhd: Enable p2p support bits for p2p device"" into cm-10.2
Merge branch 'cm-10.2' into martincz