removing gnlib_android references again?