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

Change-Id: I24c5dba3f0f22a92279a61cacd1162b8256b22ef