Merge remote-tracking branch 'cm/cm-10.2' into HEAD

Conflicts:
	src/com/android/nfc/NfcService.java

Change-Id: If5eeb6d7395b8882d07bd7c441a5622473c17292