frameworks/native: Fix mismerge

Herp derp all day

Change-Id: I8850d2b88033cc1cf9e8e38087b7b838a3046d82