Merge "Revert "make: flatten object file directories"" into experimental
authorJohn Koleszar <jkoleszar@google.com>
Wed, 28 Nov 2012 18:08:22 +0000 (10:08 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 28 Nov 2012 18:08:22 +0000 (10:08 -0800)

Trivial merge