Merge "Revert "Check for adpf cpu hints for SurfaceFlinger during init""