tree 6356328730270e342e96fd11034d791b702b04a2
parent d08aec40b48e4bbfd841a42dbd67fe362a3697b3
author Mathias Agopian <mathias@google.com> 1486772134 -0800
committer Mathias Agopian <mathias@google.com> 1486772641 -0800

clean-ups, remove warnings, fix includes.

Test: built and run
Bug: none

Change-Id: I505df89e2263952d90fae432c5eaa7d00056c6f0