Merge "Fix use of intermediates in droiddoc"