Fix GGC compilation errors
am: 40fdc43e6b

Change-Id: I4fe7ea5d091fa7a950eef984120c89067d793a19