Merge "Reduce number of binders from SurfaceFlinger for ADPF" into udc-dev