Merge "Remove system/bin/clatd from clatd_exec"