card emulation patch port to JB

Change-Id: I73fe9aa30830951ea5b9d44e9a9bf83cb720e567
fixed inconsistant define values with android_nfc.h

Change-Id: Idccd2de60caf7b72839d158b39d14e2cfcdd5fc7