Use AospPlus forks of Tag and Nfc

Change-Id: I828b6f7c854ace5f5b800ed036c5ecc6b047bf0a