Merge "Fixes versionCode assertion in UseSharedLibraryTest" into pi-dev