Merge "SystemUI: kill MSim logspew" into lollipop