Updates for using newer tools and updating more scripts.

Change-Id: Ib5da4230c90cd2a38cd458eed2f94008cfdcfa80
2 files changed