Merge "Fix some broken tests in frameworks-net with native dependencies" am: 1fd2eb62 am: 72a20c39 am: c08dcf6a Change-Id: Ibcc47204869e8debc031bf12851c233a14a9e535