Merge "Remove core-libart dependency on /system tz files"