Merge "Merge "Merge "Fix intermittent build failures with droiddoc generated sources" am: a11709b185 am: 044ddc2352" into oc-dr1-dev-plus-aosp am: edc9bbc042  -s ours am: 72445ec608  -s ours"