Add HTC One special edition (DO NOT MERGE)
Tadashi G. Takaoka authored
This change also fixes a cosmetic regexp bug in Galaxy SIII.

Bug: 9109493
Change-Id: Ie93ae38d1ca1817d4019bb1483ab7f3740564b96
a009d2c9