Modify makefiles to prevent libs from being created twice and breaking the build

Change-Id: Ia1be0089695f90f20f458f107f51db067fdfa7bc
Merge branch 'android-4.4_tst' of https://github.com/Haus1/android_hardware_qcom_display into HEAD