Merge "kernel.config: add CONFIG_NFS* testing"
am: 160671d409

Change-Id: I7785489bc04968f99a86cb1d6fe485f79ec00c56