Merge "Fix intermittent build failures with droiddoc generated sources" am: a11709b185
am: 044ddc2352

Change-Id: I8927f668751cd35d2445d281105417959202db54