Merge "Fix the DRM_FORMAT match with corresponding PixelFormat"
am: 1e4f9c0477

Change-Id: I6e373814b25c0b2baef633b5c915d8a11e5037fa