Merge tag 'LA.UM.9.14.r1-21000-LAHAINA.QSSI13.0' into staging/lineage-20.0_merge-LA.UM.9.14.r1-21000-LAHAINA.QSSI13.0

"LA.UM.9.14.r1-21000-LAHAINA.QSSI13.0"

# By Anand Abhishek (1) and others
# Via Anand Abhishek (1) and Linux Build Service Account (1)
* tag 'LA.UM.9.14.r1-21000-LAHAINA.QSSI13.0':
  mm-core: Remove hardcoded path
  media: bengal: Enable Codec2 for HY11 builds
  media: neo: Enable Codec2 for HY11 builds

 Conflicts:
	mm-core/Android.mk

Change-Id: Ie2b9677cb3aa9f85f764c29b42858993338e6a57