Merge "Update NativeBridge interface in ART test"