Vendor/Samsung: hlte prop merge derp

Change-Id: Idf915feb6fd47c564b7cf1c30effe715646cea20