Merge "Work around droiddoc bug http://b/2022288."