Fix some automerge artifacts
Fix some automerge artifacts

Some changes in 1ca1186 were mistakenly reverted by a later merge,
this commit re-instated the chanages from values to enums.

Change-Id: Ia6b01c31da584a1f612996e6432612c1295b9eaf

jmvalin/aom,running770/libvpx,iniwf/webm.libvpx,Topopiccione/libvpx,openpeer/libvpx_new,liqianggao/libvpx,hsueceumd/test_hui,charup/https---github.com-webmproject-libvpx-,felipebetancur/libvpx,webmproject/libvpx,stewnorriss/libvpx,smarter/aom,openpeer/libvpx_new,altogother/webm.libvpx,running770/libvpx,pcwalton/libvpx,smarter/aom,goodleixiao/vpx,thdav/aom,ittiamvpx/libvpx-1,jmvalin/aom,pcwalton/libvpx,jmvalin/aom,kalli123/webm.libvpx,smarter/aom,ittiamvpx/libvpx,shacklettbp/aom,mbebenita/aom,kalli123/webm.libvpx,zofuthan/libvpx,Suvarna1488/webm.libvpx,shacklettbp/aom,webmproject/libvpx,altogother/webm.libvpx,iniwf/webm.libvpx,pcwalton/libvpx,mwgoldsmith/vpx,reimaginemedia/webm.libvpx,zofuthan/libvpx,gshORTON/webm.libvpx,matanbs/webm.libvpx,reimaginemedia/webm.libvpx,Acidburn0zzz/webm.libvpx,kim42083/webm.libvpx,WebRTC-Labs/libvpx,Maria1099/webm.libvpx,reimaginemedia/webm.libvpx,Laknot/libvpx,iniwf/webm.libvpx,liqianggao/libvpx,Acidburn0zzz/webm.libvpx,shyamalschandra/libvpx,liqianggao/libvpx,reimaginemedia/webm.libvpx,jacklicn/webm.libvpx,kalli123/webm.libvpx,shareefalis/libvpx,shyamalschandra/libvpx,mbebenita/aom,shacklettbp/aom,matanbs/webm.libvpx,Suvarna1488/webm.libvpx,gshORTON/webm.libvpx,mwgoldsmith/vpx,Maria1099/webm.libvpx,lyx2014/libvpx_c,jmvalin/aom,jdm/libvpx,Suvarna1488/webm.libvpx,jdm/libvpx,Maria1099/webm.libvpx,abwiz0086/webm.libvpx,iniwf/webm.libvpx,gshORTON/webm.libvpx,openpeer/libvpx_new,pcwalton/libvpx,lyx2014/libvpx_c,Acidburn0zzz/webm.libvpx,shyamalschandra/libvpx,matanbs/vp982,GrokImageCompression/aom,mbebenita/aom,lyx2014/libvpx_c,webmproject/libvpx,mbebenita/aom,jacklicn/webm.libvpx,Distrotech/libvpx,matanbs/vp982,Topopiccione/libvpx,abwiz0086/webm.libvpx,hsueceumd/test_hui,jmvalin/aom,ittiamvpx/libvpx-1,matanbs/vp982,running770/libvpx,jacklicn/webm.libvpx,shyamalschandra/libvpx,abwiz0086/webm.libvpx,smarter/aom,liqianggao/libvpx,WebRTC-Labs/libvpx,liqianggao/libvpx,liqianggao/libvpx,matanbs/webm.libvpx,hsueceumd/test_hui,zofuthan/libvpx,smarter/aom,matanbs/webm.libvpx,thdav/aom,goodleixiao/vpx,mwgoldsmith/libvpx,stewnorriss/libvpx,jacklicn/webm.libvpx,mwgoldsmith/libvpx,matanbs/vp982,kleopatra999/webm.libvpx,WebRTC-Labs/libvpx,matanbs/webm.libvpx,zofuthan/libvpx,VTCSecureLLC/libvpx,altogother/webm.libvpx,altogother/webm.libvpx,GrokImageCompression/aom,Topopiccione/libvpx,n4t/libvpx,kim42083/webm.libvpx,matanbs/vp982,thdav/aom,n4t/libvpx,shacklettbp/aom,shacklettbp/aom,stewnorriss/libvpx,felipebetancur/libvpx,kleopatra999/webm.libvpx,running770/libvpx,shyamalschandra/libvpx,thdav/aom,VTCSecureLLC/libvpx,ShiftMediaProject/libvpx,charup/https---github.com-webmproject-libvpx-,VTCSecureLLC/libvpx,ittiamvpx/libvpx,ShiftMediaProject/libvpx,Acidburn0zzz/webm.libvpx,n4t/libvpx,goodleixiao/vpx,mwgoldsmith/libvpx,shareefalis/libvpx,jacklicn/webm.libvpx,mwgoldsmith/libvpx,pcwalton/libvpx,GrokImageCompression/aom,abwiz0086/webm.libvpx,Laknot/libvpx,pcwalton/libvpx,kleopatra999/webm.libvpx,Topopiccione/libvpx,gshORTON/webm.libvpx,ShiftMediaProject/libvpx,gshORTON/webm.libvpx,shareefalis/libvpx,stewnorriss/libvpx,Topopiccione/libvpx,altogother/webm.libvpx,ShiftMediaProject/libvpx,Acidburn0zzz/webm.libvpx,hsueceumd/test_hui,Maria1099/webm.libvpx,mwgoldsmith/libvpx,kalli123/webm.libvpx,mwgoldsmith/vpx,running770/libvpx,kim42083/webm.libvpx,Acidburn0zzz/webm.libvpx,hsueceumd/test_hui,Laknot/libvpx,kalli123/webm.libvpx,kim42083/webm.libvpx,kleopatra999/webm.libvpx,stewnorriss/libvpx,matanbs/webm.libvpx,lyx2014/libvpx_c,kim42083/webm.libvpx,Laknot/libvpx,smarter/aom,lyx2014/libvpx_c,luctrudeau/aom,stewnorriss/libvpx,mwgoldsmith/vpx,charup/https---github.com-webmproject-libvpx-,openpeer/libvpx_new,kalli123/webm.libvpx,VTCSecureLLC/libvpx,Distrotech/libvpx,reimaginemedia/webm.libvpx,openpeer/libvpx_new,webmproject/libvpx,VTCSecureLLC/libvpx,jdm/libvpx,GrokImageCompression/aom,mbebenita/aom,thdav/aom,matanbs/vp982,altogother/webm.libvpx,goodleixiao/vpx,felipebetancur/libvpx,jdm/libvpx,hsueceumd/test_hui,lyx2014/libvpx_c,VTCSecureLLC/libvpx,luctrudeau/aom,Distrotech/libvpx,goodleixiao/vpx,Distrotech/libvpx,Maria1099/webm.libvpx,luctrudeau/aom,jdm/libvpx,zofuthan/libvpx,WebRTC-Labs/libvpx,shareefalis/libvpx,shareefalis/libvpx,thdav/aom,jacklicn/webm.libvpx,shareefalis/libvpx,felipebetancur/libvpx,ittiamvpx/libvpx,n4t/libvpx,ittiamvpx/libvpx-1,Suvarna1488/webm.libvpx,ittiamvpx/libvpx-1,luctrudeau/aom,Maria1099/webm.libvpx,webmproject/libvpx,Distrotech/libvpx,Laknot/libvpx,Laknot/libvpx,abwiz0086/webm.libvpx,shacklettbp/aom,matanbs/vp982,charup/https---github.com-webmproject-libvpx-,mwgoldsmith/vpx,jmvalin/aom,ittiamvpx/libvpx-1,ittiamvpx/libvpx,n4t/libvpx,gshORTON/webm.libvpx,zofuthan/libvpx,ShiftMediaProject/libvpx,kleopatra999/webm.libvpx,charup/https---github.com-webmproject-libvpx-,Suvarna1488/webm.libvpx,ittiamvpx/libvpx-1,mbebenita/aom,webmproject/libvpx,mbebenita/aom,Suvarna1488/webm.libvpx,GrokImageCompression/aom,mwgoldsmith/libvpx,charup/https---github.com-webmproject-libvpx-,running770/libvpx,luctrudeau/aom,ittiamvpx/libvpx,reimaginemedia/webm.libvpx,felipebetancur/libvpx,mwgoldsmith/vpx,Distrotech/libvpx,kim42083/webm.libvpx,goodleixiao/vpx,iniwf/webm.libvpx,openpeer/libvpx_new,mbebenita/aom,iniwf/webm.libvpx,kleopatra999/webm.libvpx,luctrudeau/aom,jdm/libvpx,felipebetancur/libvpx,Topopiccione/libvpx,WebRTC-Labs/libvpx,shyamalschandra/libvpx,mbebenita/aom,ittiamvpx/libvpx,GrokImageCompression/aom,abwiz0086/webm.libvpx