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

Change-Id: I60c7b5d295186f753610bbca77f61c9b3dee9d14