Merge "Remove core-libart dependency on /system tz files"
am: 5a7acb3345

Change-Id: Ib693c1346fa73aeec3cff1c40e040cb2aea9a735