Correct some copy+pasta/incorrectly named fails for coconut and nicki

Test your builds with the full-blown vanir tree, without the semc local_manifest... and build vanir_*-userdebug. kthx

Change-Id: I0fe3f2d75566f3beeb680cc2120734bf2780f6a4