Pull upstream fix for CVE-2016-5552 am: 7247f6a70e am: 7013de23a1 am: 0398dec2b9
am: cb3d605b46

Change-Id: I4ab54a95b54968a38dc174dd89a45a27ee0fab23