Cleanup clang warnings.

Change-Id: I084be1dfd9bc72ab609ac1414686c0aef73667d4
Signed-off-by: Steve Kinneberg <stevek@qce.qualcomm.com>
Merge "Cleanup clang warnings."