Merge "Add arguments to native methods required for host builds" into sc-dev