Merge "FPII-2507: Remote code execution vulnerability in Expat CVE-2016-0718 A-28698301" into fp/fp2_5.1_int