Handle keynames with special characters such as - and .
Brian Carlstrom authored
Bug: http://code.google.com/p/android/issues/detail?id=34577
Bug: 6837950

(cherry-picked from 0114bd9f)

Change-Id: I0c265fe73c1b2c430ffd196a21691264f8f3b555
a8c703d9