[Matahari] [PATCH] Fix build failure on windows introduced by augeas patch