Allow building against other qcom display HALs

* also fix normal pathing to use the new aosp paths

Change-Id: I26ca3f28f950e82130ba51b4408234d06703d044
Merge "Allow building against other qcom display HALs" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	libs/gui/Android.mk
	services/surfaceflinger/Android.mk

Change-Id: Ic5cdb71cbf1003a94daeab44ab7fa57a9f9eb20a