tree 3b51bed38dd2773a4d0e29beb63ce8d0b53b7712
parent 833f9c5c2682d9c44f4b712ac2014e7550433190
parent 749be0964685613558db4bc8be9f8f90c5cdc109
author Maciej Żenczykowski <maze@google.com> 1652218130 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1652218130 +0000

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

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