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

Change-Id: I3f8be95e56a05215265e96e542508792e7458e10