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

Change-Id: Ifb631607efe3e4d5ece9897851afe5153d237897