Merge "Add test for getError() of NativeBridge." am: 7e4f71f901 am: dc6d5995b2
am: b46189d23a

Change-Id: I4370bd3cfff0bfacf3e9b7dd37e9b02be96fb0c7