Fix compile issues after Google3 migration

Bug: 140077022
Test: Manual
Change-Id: I58039277f8f4f7d8655eed4722b09393924e9882
2 files changed