Merge branch 'android-4.3-aries' of github.com:mitwo-dev/platform_hardware_qcom_media