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

Change-Id: I115b354a50dc955db8e61ec1d2d2b68107e3c1cd