Merge "Track move of APEX module tz files under etc/tz"