taoshan: whitespace! whitespace !

thanks Michael Bestas
+ little cleanup
Change-Id: I48ddc34f712b0c5e86696635b636e04d66bdfca1
Merge branch 'cm-11.0' into kk_mkt