Merge "Deactivate multi-thread in multi-dex mode" into klp-dev