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

Merge commit '0962b71980b7e850a1ef87766ae12de16ab2efb4' into gingerbread-plus-aosp

* commit '0962b71980b7e850a1ef87766ae12de16ab2efb4':
  DO NOT MERGE: Fix the build by ignoring directories that don't exist.