Merge "Fix a typo in NumberPicker javadoc."