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

Change-Id: Ib639b95a1d277149dde27d0fa62033ec183dd5c3