Fix builds for some devices

Change-Id: I46c649aba291c1b73060d4449008f55cf406cb62