Merge "Workaround for USAP support in jitzygote." into qt-dev am: 94b2981853
am: 72d176b3ba

Change-Id: If0f479d569d4f0245be3cb7685280da8d76ba079