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

Change-Id: I2d643866ea2ccdebbdcb71c1bd1d8a480c0c167c