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

This is mostly a fast-forward, much easier than having people test a branch switch
Conflicts:
	Android.mk

Change-Id: I4f1a006d28042777e89bf9696c93245f7d43c92e
Returned back to our original ION_CAMERA configuration