device_(manifest|matrix).xml -> vendor*
am: b9bbc25afa

Change-Id: I397054ac48121579aa8adada3f3a7794d2d465f9