Clean up device build props

Change-Id: I48ad88b22c02b613cdb077afcebdaef5d8293bd7