Merge "minui: GRSurface manages data with std::unique_ptr." am: 481613b35f
am: 6f42a59e7d

Change-Id: Ifb25cb998b7a241e1e3dbea14939267ac3bc7899