Merge "surfaceflinger: fix misplacement of getHwComposer related function"