Update manta vendor files

Change-Id: I075b20a9a5908dd3db233d1f170aa91eab81ab0f
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge "Update manta vendor files" into jb-mr2