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

Change-Id: Iff2c5b51e799e54f11c7e693b129b7d799d23e58