Merge "FPII-2595 : Elevation of privilege vulnerability in Qualcomm media codecs CVE-2016-6761 A-29421682" into fp/fp2_5.1_int