Merge "Label emulator devicetree dir." am: 8716646d63
am: 73d36f64b1

Change-Id: I3945cb34c9d41a2834b1da85a980ac335bf2fa58