Merge "Remove host simulation of runtime tzdata files" am: 85ab19687e
am: 4b6a5ef84c

Change-Id: I2297c2a743ee0a4dd6a8fea8faa326a1da8538f1