Fix 2 derpmerges

Conflicts:
	libs/ui/Android.mk
	libs/ui/GraphicBufferAllocator.cpp