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

Change-Id: I2c7163e4f621f6146817084f29d3777139cf33c6