Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1