Build fixes (System ui builds)

Change-Id: I50cf751cb3864f38ad11351b213fc2cb6fd42c72