Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"