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

Change-Id: I59cdb2129f1add978f040c6605784dc28af45d3b