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

Change-Id: Idfc34008bf7d9c636ee67fed3f07552be688052d