Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" am: c06dbc114f  -s ours
am: 607f74b317  -s ours

Change-Id: I78b9a3639321a15a26eff3abd4c80a9d84d9229c