Updates to allow building in a desktop environment. am: dadb17161e
am: 3d00a28753

Change-Id: I083cb0630df890122f7275a36c9f6dbdfc69e02c