Build fixes

Change-Id: I964b195ad102742ed19e6d959057c985a50b91b6
Signed-off-by: Evan Anderson <evan1124@gmail.com>
Merge branch 'linuxman/jellybean'