Merge "Fix license_type. Contains AMD and GPL" am: 5bec930542 am: 5ef9883d98 am: be955f090b am: 789ee5071e am: e98b4edd77

Original change: https://android-review.googlesource.com/c/platform/external/mesa3d/+/1556392

Change-Id: I338b431bfdca0367978e95f83ae6f8ede5a083cd