Merge changes from topic "cherrypicker-L84300000954428151:N75900001263150523" into tm-dev

* changes:
  remove unused #defines
  remove _mainline suffix from {clatd,netd}.o_mainline targets