Adding all nfc vts related things back.

Test: none
Change-Id: I84a42ae27d36a5479f2ca859849bb1b4536bdbad
28 files changed