Typo fix and additional cleanup. Enyo-DCO-1.1-Signed-Off-By: Jim Tang (jim.tang@lge.com)
Merge branch 'core' into enyo-super