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

Change-Id: Ic53965e38b87660382d281c20c2bc6feb0da8a22