Device tree cleanup

Change-Id: Ieada948ad72173999bac9bea7e78d523de389e90
Merge "Device tree cleanup" into lollipop