It's no problem. Just noticed I have two #5s. After you download and extract the six binaries from Google, the directory should look like this:
vendor/nxp
vendor/nxp/crespo
vendor/nxp/crespo/device-crespo.mk
vendor/nxp/crespo/proprietary
vendor/nxp/crespo/proprietary/libpn544_fw.so
vendor/nxp/crespo/BoardConfigCrespo.mk
...
When you sync again in the future, it will refuse to sync any changes in the files you have edit. It will tell you that you need to save your work first.If 4.2.1 source releases, how can I update source w/o losing my commits?