Merge "Avoid building CreateTimeZoneDistro for target"
am: 4ff0fe038b

Change-Id: Ib0dc6bf49813e365fea1be046fd5640927e9040d