Merge "Verify that EditorInfo.packageName and uid are consistent"