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