Merge "Rewriting android.text.format.Time without the native _tz functions"