Merge "Disable tzdata in $ANDROID_DATA." into lmp-mr1-dev