Merge "Update SurfaceFlinger to use power V4 AIDL"