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

Change-Id: Ife7768f97b70bf799526d8d89bd397fa18dbda71