Merge "Update NativeBridge interface in ART test"
am: 6f005931d0

Change-Id: I50f9e99ca6e75bd4b2c0fc55a5a07c4377d64e8d