Merge "Replace FOURC('a', 'b', 'c', 'd') with FOURCC("abcd")" am: ecfbd58de8
am: 1c0163ff3d

Change-Id: Iec39eef8f033a2486d86a2f1ca426ab0c413c9dc