Merge "Update NativeBridge interface in ART test" into oc-dev