Fix bad merge fixes build breakage.

Signed-off-by: Eric Olsen <eolsen@android.com>
1 file changed