Add HTC One special edition (DO NOT MERGE)

This change also fixes a cosmetic regexp bug in Galaxy SIII.

Bug: 9109493
Change-Id: Ie93ae38d1ca1817d4019bb1483ab7f3740564b96
Merge tag 'android-4.3_r3' into HEAD

Android 4.3 release 3.0