Bug fix: Turn NFC ON/OFF requires a reboot.

Change-Id: Ib15b1b4fe9479e395bd11c46eaf02ac04e67a48c
Enable NFC host-based card emulation.
Add support for extra NFC features.
Enable NFC provisioning for EDU.

Change-Id: I73e06ed5b9c887794dc8e7f35bc59ca9b16f78d1
asound.conf: fix default option (AlsaMixer works now)

Change-Id: I3b8375113967280e71fc6874d51214b95ac0578f
Fix typo

Change-Id: I5311f45b21875acc18864d5e3646b917cde4ecea
Merge remote-tracking branch 'cm/cm-11.0' into HEAD