Merge pull request #2168 from drodriguez/android-time-zone-database

[android] Support for time zones in Android.

Author: drodriguez