DO NOT MERGE. Fix make builds for nyc-support-25.2-dev
am: 27aeab2590  -s ours

Change-Id: I6fc769d1267a42483c18a7d0075979b0a0353704