Merge "Support for a android.text.format.Time implemented entirely in Java"