Merge remote-tracking branch 'origin/master' into leonard

client_Wu Xijin

2018-10-29 d82561629d51d3863002a3f1bbb32ef6b1b429bb

 Core/ResModule/AssetBundle/AssetBundleUtility.cs

@@ -73,6 +73,7 @@
            var item = keys[i];

            if (item.Contains("builtin"))

            {

                m_AssetBundleDict[item].Unload(false);

                m_AssetBundleDict.Remove(item);

            }

        }