Merge "Add explicit nativebridge header dependency to art test." am: 6d2e76b421
am: a07e234fc7

Change-Id: Iaf2f29fc640544dcd04f95abd383c7b36e4809dc