Merge tag 'AU_LINUX_ANDROID_LA.HB.1.1.1.05.01.01.063.284' into HEAD
* commit 'e71380abce7b3128b140ac277dcde643b01da7b9':
device: msm8996: fix qpnp_pon keylayout file name
android-perf: property to set profile number
android-perf: property to enable game perf-library
msm8996: Add property to enable sde downscale feature
qcacld: Update the STA keep alive period max value
msm8996: add media codec entry for QTI FLAC decoder
msm8996: Use compressed kernel
WLAN: Keep msm8996 config file/values same as msm8992
msm8996: Add property for additional input buffers and perf mode
Set encryption metadata footer flag in recovery.fstab
msm8996: init.target.rc: Start up pm-proxy service at boot
msm8996: Enable recovery to update non-hlos images on 8996
msm8952_64: add secontext for the file in /dsp folder
Ultrasound: modifications for SEAndroid
Conflicts:
init.target.rc
media_codecs.xml
Change-Id: I0b8056bcd14e406c4fc3ef5940a5c78c68611996