Merge "Disable tzdata in $ANDROID_DATA."