mondrianwifi: Use our camera wrapper again

Change-Id: I64e2ad98cdebd5814eb850a00fdc8e92b5de5beb
Merge pull request #435 from crpalmer/camera-wrapper

mondrianwifi: Use our camera wrapper again
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0