Merge "Allow powerhal to adjust surfaceflinger scheduling"