Merge "Make vold compile with -Werror -Wall."