Fix compile error due to singleton changes in MR1

http://review.cyanogenmod.org/#/c/30269/ shouldn't be needed anymore.

Change-Id: I99d4129f67c270781e4cbdf96040aa4cdb713ffd
Revert "gralloc: Override gralloc calculated size only if bufferSize is greater."

Causes corrupt preview for 480p mode on 7x30.

This reverts commit 81a5e0e855858a4fb44fd1fe20c74d9ea7390a08.
Allow to setup fps manually and some other changes

Change-Id: Ida4b2b5006906070822e52ef98236407615da70e

Conflicts:

	Android.mk
	common.mk
	libgralloc/framebuffer.cpp

Conflicts:

	libgralloc/framebuffer.cpp

Conflicts:

	libgralloc/framebuffer.cpp
Build with MDP4.1 (partial bugfix for video blending)

Change-Id: Id38be90043224c3f18aa9bd569ce4c5bc8a27e82

Conflicts:

	liboverlay/overlayMem.h
hwc: dont mistake COPYBIT for FRAMEBUFFER_TARGET

Change-Id: Ic70ea63b51066d3179d5185194cf8a1085eadbe4
display-legacy: clarify COPYBIT == HWC_BLIT

Change-Id: I4e531764a782a583312d3734f4fa0d3a4604b667
Merge remote-tracking branch 'dastin/cm-10.1' into cm-10.1