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

Change-Id: Icc61ecc41977b84b3f2a089a26a985856b185a60