Replace hardware/qcom/keymaster path to new repository android_hardware_qcom_keymaster

Change-Id: Ia06bdfcd40a7d1430e1c5a3fbdaaca84a0970a05
Merge remote-tracking branch 'omni/android-4.4' into android-4.4

Conflicts:
	default.xml