Revert "Update ril.h for qcril"

This reverts commit eb002c3d2f5e4a49a517b84ba6b5de67364af4d4.
Revert "Recovery: Use pre overlay merge graphics.c"

This reverts commit ad5112f3d4dea443ed421b9f8947d81076c3f060.

Conflicts:
	BoardConfig.mk

Change-Id: Ib95070356b7e1304cbc10a0b67fcea81edc0740e
Slim it up

Change-Id: I7e6a6ca743150790b7e1d43216aebb27e5d2f716