Merge "Merge tag 'libdrm-2.4.99' into aosp/master"