Merge "Don't use ApkAssets::GetPath for equality checks" into sc-dev