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

Change-Id: I1a0afe7873551cdf44e0671d5d24760f5ff951e9