Merge "FPII-2508: Remote code execution vulnerability in Expat CVE-2012-6702 A-29149404" into fp/fp2_5.1_int