Merge "Switch -Xjnitrace over to using a custom JNI bridge." into dalvik-dev