Merge \\"Turn unused source files from warning to error\\" am: 73609480b3
am: 90f03ecfee

Change-Id: Ib350a58be93424cba2d9c18a55c40fce12af852e