am 1ad13805: (-s ours) am 0962b719: Merge "DO NOT MERGE: Fix the build by ignoring directories that don\'t exist." into gingerbread

Merge commit '1ad138059922bcd94674b9d277bd1a83a5ddcdeb'

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