Merge changes from topic "mesa-20.3.4-update" am: 55a70f8ed0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib68999e9ef9a175455b4714017a46e29cb6180a7