Merge "project: msm8909: select address map for tzapps, based on version."