Don't use EXPERIMENTAL for SKANKY builds
add htc one maintainers

Change-Id: I853d49fe76525ac86d9ce807f9b93f7a4a8488e8
Contributors: add fireball maintainers

Patch Set 2: alphabetize

Change-Id: Ia1e8f2c698a8a79cfe3273323503d773ee1c2c49
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1
Merge remote-tracking branch 'origin/cm-10.1' into cm-10.1