Merge changes Ia3743acd,I92d22d25

* changes:
  Remove reference to com.android.internal.util
  Remove internal references from DatePicker