am 95f7c854: Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit '95f7c8549928c0b383b3b3651224ded6b05a2f51':
  Use classnames instead of ints for NFC techs.