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

Change-Id: I9c8bd6dececba2e9d3b0c42a14ca0d94fcb6874b