Merge remote-tracking branch 'aosp/upstream-cros-master'

Test: m libvirglrenderer
Change-Id: I1e0467d7a22e31a25bdc257fe35b7e2bc6a4bdaa