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

Change-Id: I84c12b17e33f4411a950a614d7e021074a28d648