Merged with 4422 GPL ARM build bits