CVE 2016-2109 fix am: 56abb3ed72 am: e0becbcb23 am: 5cfdab8c9d am: 61c19b30c3  -s ours
am: 05b44fa879  -s ours

Change-Id: I2bb8574aa83abca3bf2945fc782fa599d6fefc8a