gn-build: Fix GN build after the merges

This CL fixes the GN build after the recent merges to aosp/master.

Change-Id: I0c9d8178986165d5a4a67261532e8a08b6923d22
4 files changed