Merge remote-tracking branch 'aosp/upstream-aosp-merge-fdo-master' into libdrm

Change-Id: Ifff1b65a81b838a6ab77c9f33eb5c3c514c250db