Merge "SEAndroid: Allow SurfaceFlinger to access dynamic_fps node"