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

Change-Id: I9b37395d0403e780060ef107d21156919378f957