vendor update

Change-Id: I460a8aca9247fae8d7ce9bc18e6d0217192690a6
remove because merge edison

Change-Id: I3ccc1167ea45a5f68ef021ed769092816460e11d