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

Change-Id: I269d383daf9eb7e7dec6ed5f792debe150f2ae09