Merge remote-tracking branch 'aosp/upstream-aosp-merge-fdo-master' into libdrm
am: 16adcbf47e

Change-Id: I01b8c6af2316c0f7e0ad7cdd18d491a040a5abb3