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

Change-Id: Icfa806d237b66f52d3b5787c7c09112f0aa0fdbb