Merge "Fix some broken tests in frameworks-net with native dependencies"
am: 1fd2eb6276

Change-Id: I628ee4ac71a762c02f9fe0440db08125693efd3c