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

Change-Id: I7c6c2dc0fcb50387df07760e913f8f6841bc02bc