display-caf: Squashed merge of qcom-4.4_2.7 branch updates

Since that branch is mostly a fast-forward this time, let's just test
a squashed merge!  :)

Conflicts:
	libhwcomposer/hwc_copybit.cpp

Change-Id: If8e366f7679a7b8ef1467f23982b4fb4f0ac333f