Merge "droiddoc: Fix trailing ':' in -classpath, -sourcepath values"
am: 40594041f4

Change-Id: I5bd49c9a5e199f797781dbb14f3bd1bc2915c1ad