Merge "Merge "Add explicit nativebridge header dependency to art test." am: 6d2e76b421 am: a07e234fc7" into oc-dev-plus-aosp
am: 9292242b8d

Change-Id: I2ce1a77b8e6fef2095ddd626f916b9618e32af7e