Reset master to upstream 120775eb and merge history. Bug: 35151782 Test: Build dtc, use output dtc to build dts, can output correct dtb. Change-Id: I4d3ef31a8597f7b214fea2d70ceb99a08d57d925