Another fix attempt

Change-Id: Id6d534de059f0f63093d3b7ffe0b4499346b998e
Revert "Unbreak several merge derps in native and update"

This reverts commit 68f3515b41873bf9e27f61239bd41556ce7e147b.

Conflicts:
	libs/gui/Surface.cpp

Change-Id: I16bbf76e0680e6397dfad1f15c500aa88c05ac0c