Merge "Fix intermittent build failures with droiddoc generated sources" into oc-mr1-dev
am: b7c2d0abaf  -s ours

Change-Id: Ieb894fa1b8f87cd8847e034f29e8d2062ac1df9e