Merge "Accept multiple --crate-type and fix for new cargo." am: 8833757764

Change-Id: Ie12156effc31e36f73f7c5230fa89a40a6509b2e