Merge "[AssetManager]:Fix thread race caused double free issue." am: 126e022095
am: f48d0b8f19

Change-Id: Ia7da9ff37d813729a8c916a3b6e378110045aa17