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 branch 'cm-11.0' of git://github.com/CyanogenMod/android_frameworks_native into cm-11.0