Reorder code to be consistent accross branches
Reorder code to be consistent accross branches

This is to make future merge a bit easier.

Change-Id: I1039de381d8fe7b9988b57c23d15d0cb5f2fcd32

thdav/aom,jmvalin/aom,ShiftMediaProject/libvpx,webmproject/libvpx,jmvalin/aom,thdav/aom,ittiamvpx/libvpx-1,Topopiccione/libvpx,mwgoldsmith/libvpx,ittiamvpx/libvpx-1,webmproject/libvpx,jmvalin/aom,shacklettbp/aom,ShiftMediaProject/libvpx,shacklettbp/aom,openpeer/libvpx_new,jmvalin/aom,mwgoldsmith/vpx,thdav/aom,openpeer/libvpx_new,mbebenita/aom,ittiamvpx/libvpx-1,webmproject/libvpx,jmvalin/aom,mbebenita/aom,openpeer/libvpx_new,webmproject/libvpx,mwgoldsmith/libvpx,ittiamvpx/libvpx-1,webmproject/libvpx,mwgoldsmith/vpx,mbebenita/aom,mwgoldsmith/vpx,GrokImageCompression/aom,smarter/aom,luctrudeau/aom,Topopiccione/libvpx,ShiftMediaProject/libvpx,openpeer/libvpx_new,mbebenita/aom,mwgoldsmith/libvpx,Topopiccione/libvpx,smarter/aom,smarter/aom,Topopiccione/libvpx,smarter/aom,GrokImageCompression/aom,luctrudeau/aom,mwgoldsmith/libvpx,shacklettbp/aom,smarter/aom,mbebenita/aom,mwgoldsmith/libvpx,mwgoldsmith/vpx,openpeer/libvpx_new,mbebenita/aom,ShiftMediaProject/libvpx,ShiftMediaProject/libvpx,GrokImageCompression/aom,mwgoldsmith/vpx,mwgoldsmith/libvpx,shacklettbp/aom,mbebenita/aom,mwgoldsmith/vpx,ittiamvpx/libvpx-1,luctrudeau/aom,webmproject/libvpx,luctrudeau/aom,GrokImageCompression/aom,thdav/aom,Topopiccione/libvpx,openpeer/libvpx_new,mbebenita/aom,Topopiccione/libvpx,smarter/aom,GrokImageCompression/aom,thdav/aom,shacklettbp/aom,shacklettbp/aom,mbebenita/aom,luctrudeau/aom,GrokImageCompression/aom,ittiamvpx/libvpx-1,jmvalin/aom,thdav/aom,luctrudeau/aom