HTC vendor updates

Summary: m7/s4 colorconvert props

Test Plan: confirm and merge

Reviewers: randall.rushing, synergy

Differential Revision: http://review.codefirex.com/D59