Merge "Fix device builds"