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

Change-Id: Ia14b67836ef51d66024f3f5a7f482769e4943ed6