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

Change-Id: I11236af9d4c31153a312be1f432507dd6aac3800