Merge "Add -Werror to compile warning free projects." am: 355e96774b
am: 05388b7618

Change-Id: Ib4613feea14a0edf06f5395b1646a0c148a7a792