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

Change-Id: Ib745d5eafca19b4cbe5b4c9cf7dc4c85f35ad9ad