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

Change-Id: Icee436d2529c99230a1f6be8f3c75d80aaad812d