Merge "FPII-2338: Information disclosure vulnerability in Qualcomm sound codec (device specific) CVE-2016-3893 A-29512527" into fp/fp2_5.1_int