Merge "Fix "Allow the system AssetManager to be reinitialized for testing""