Merge "Fix mStringBlocks race in the AssetManager"