Fix compilation errors Change-Id: If714b63ba177c8f956af51fa02f5e8486bb2f8ee Signed-off-by: Edwin Kempin <ekempin@google.com>