Fix compiling errors due to git merge
Fix compiling errors due to git merge

There were a few conflicts between the new non-RD partition search
and recent clean-up patches, which were not caught by git control.
This commit fixed these issues.

Change-Id: Ieebefbd6c19d81d0d13e3c568877d5cce2ab7797

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