Adapt to new directory layout of build/

See [this G+ post][1] (down in the comments, search for 'intermediates')
for more details.

[1]: https://plus.google.com/+AndroidDevelopers/posts/Tzof6zatrJW