Merge "Fix intermittent build failures with droiddoc generated sources"