Merge "Replace surfaceflinger protobufs with protobuf-lite"