Merge "Fix the DRM_FORMAT match with corresponding PixelFormat" am: 1e4f9c0477 am: e0ded949e6 am: d6a445c1b5
am: 53bca233b1

Change-Id: Ideb0925b09621a8d68c117a881863c281381c9f5