Fix build failures and accept clang suggestions

Change-Id: Ib3c71c42c7ac7737bf0185858ef37b322df42167
3 files changed