Merge "platform: msm_shared: Change target name from zirc to 9640"