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

Change-Id: I857d4f01759a807bb4d4665ec215994a3cd43d7d