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

Change-Id: Icaab0d441867ee4d28a69aa8b52416a2b8bf1f3e