Ported build break fixes from CrOS side There have been some fixes for build break in libweave on CrOS. Porting them over to Brillo Change-Id: I839e92c341aab6bd64165cb19173fcafec9b1fad