Build fixes

Change-Id: Icff52d62af4ee1e426d0c990e7d4672f14955e86
2 files changed