CVE 2016-2109 fix am: 56abb3ed72 am: e0becbcb23 am: 5cfdab8c9d am: 61c19b30c3  -s ours am: 05b44fa879  -s ours am: 01ff070dc2  -s ours am: 3257cdbcc1  -s ours am: d732a2a9ad  -s ours am: aa047e05e6  -s ours
am: 0257462b0f  -s ours

Change-Id: I09bced1a8d931ad4a626ccc67260f46f71ed6f8d