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