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

Change-Id: I5f5c2e63bfd9829571bcff480004ab484ee28171