fixed building errors

Change-Id: Idf4d098429dc97d7a377e8b518945b7a3dcd95e4