Handle the null folder_name case.
Handle the null folder_name case.

Submitting the code for yukawa.  See http://codereview.chromium.org/7703004/
Review URL: http://codereview.chromium.org/7739004
old8xp/gyp_from_google,old8xp/gyp_from_google,old8xp/gyp_from_google,old8xp/gyp_from_google,old8xp/gyp_from_google