Merge "Fix intermittent build failures with droiddoc generated sources" into oc-mr1-dev