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