Merge "DO NOT MERGE: Fix the build by ignoring directories that don't exist." into gingerbread