deb: Rebase device tree to current AOSP state

Change-Id: Ic2bd84ba68494aaec51bfaeba4b4e169337d55c3