Merge "Add static_libs field to target.vendor" am: 5c50e7f7c4

Change-Id: I6afb4b56e82429280433ce436881a16e8822da07