fix build errors

Change-Id: Icd9b0384f019b574884024dedf55a611b0e84d75