Merge "Remove Valgrind entries from fs_config."
am: e61d5ccf47

Change-Id: Ia26016e8d112794817bdb809146fad55e6eb3f04