Merge "[GL Loader] Keep supporting wildcards matching in Q." into qt-dev
am: c505e16c78

Change-Id: Ie579d943b4602a7b9ad9d19d69142fe6621c900a