Revert "TEMP: Fix Google's derp on platform/external/* tags"

This reverts commit b75d34075fec319b9439b6006347687289ab707e.

Google has fixed the tags on libnfc-nci now

Change-Id: I0a6e6b70ce1206d9a25b4fd8eebfd38e7f59515a
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1