Allow building against other qcom display HALs

* also fix normal pathing to use the new aosp paths

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