Revert "Revert "Track vanir's mogami" - False alarm - bottleservice didn't like handling explicitly false TARGET_NO_KERNEL value"

This reverts commit 7ee04321ed797366ed34f47dd4ae2d729234f1d3.

Conflicts:

	default.xml

Change-Id: Ifb86e3a3356e2e1c9a5dfd3ed85d7f4cf3f29de9