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