Merge "Merge tag 'libdrm-2.4.99' into aosp/master" am: 698ab7fa1f am: e3e9c23a19
am: 1dea00f0db

Change-Id: I1a1cb02eea3de84d791661cd043f5255f4c182f0