Merge "Increase JVMTI test timeout to 5 minutes" into qt-dev am: 28ce2951ea am: fecc467e79
am: 6dc2dee14e

Change-Id: Ia68d422ae95a7741c5c93b0d4a0213f8701beb9f