display: add CAF vs. AOSP hal separation ifdef

Change-Id: I466abcbf17f27a462491d2f3babf9bbd48802029

Conflicts:
	Android.mk