HTC-Extra is deprecated and should be replace with proprietary_vendor_htc

Change-Id: Ia038225ecd4abf79c3069c47afe8d0f3d1965833