Track: hardware_qcom_*-caf & hardware_libhardware

Change-Id: I4334293989db0e73551bf64c6ed99dc0086de7b8
Comment out Terminal until I have time to fix it.

Change-Id: Ice1aa235906f95311fb342cafa396cb074b0775f