Merge "Revise javadoc script dash-f argument"