Merge "Fix buffer overflow in Trace's JNI layer" into qt-dev
am: 935a535bc6

Change-Id: I69adf81bea20e08ae59ee1321a2d262006059fc3