tree e7adaf6ff247463a7faadd325fc18f81c7b8ba3a
parent e09c3506c797541bb0215985d39549892080e9e8
author Alex Vakulenko <avakulenko@google.com> 1438894902 -0700
committer Alex Vakulenko <avakulenko@google.com> 1438894902 -0700

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