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

Change-Id: I6da94a3af143aff778bcedbdc5f4180644d2bff2