Merge "Migrate multidex to androidx" into pi-dev