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

Change-Id: Ie592595330b030df70aeb9d9e414716bad07e22a