am ad7c7d38: Merge commit \'0abbfba91e781810891ac818e97a8a5a0fb6134c\' into HEAD

* commit 'ad7c7d3818b8a7a3f46692ca7aca525a0eccdcb7':
am 56728d2c: Merge "libc2dcolorconvert: fix arithmetic on a pointer to void"

* commit '56728d2cfe6d772232f27acaabee545716c0312b':
  libc2dcolorconvert: fix arithmetic on a pointer to void
am 50ae6471: Merge commit \'0405148deab7219f9d79ae521601c7bf29966702\' into HEAD

* commit '50ae6471bf27b2bc840c8a5ea4a77e5f7201e7fd':
am ab973ad1: Merge "Remove include <linux/android_pmem.h>"

* commit 'ab973ad19905119d26b2176ad72cb0b974372e55':
  Remove include <linux/android_pmem.h>
am 1490d8ec: Merge "qcom: fix errors inside ALOGV"

* commit '1490d8ec09f3253f4a6f946d63247574c0fa0d51':
  qcom: fix errors inside ALOGV
mm-video: vidc: fix memory leak in dynamic buffer mode

In dynamic buffer mode, for non-secure playback,
output buffer is mapped before each ftb to driver.
This buffer is unmapped in the fbd. During flush
operations, the mapped buffer in ftb is not freed
leading to memory leak. To fix the issue, move
the memory mapping to just before sending the ftb
to driver.

Bug: 11973141

Change-Id: Ib0e5525fdf8132434800bf4d4ff8d27b085fc8fc
am 5a9eab65: mm-video: vidc: fix memory leak in dynamic buffer mode

* commit '5a9eab657a9f229a6ed3700f27dc1253a8eaddfb':
  mm-video: vidc: fix memory leak in dynamic buffer mode
Move Android.mks to their parent dir.

So we don't need "../" to reference source files in the common/
directory.
"../" in LOCAL_SRC_FILES causes build race condition: the path of object
file of ../common/src/extra_data_handler.cpp in vdec actually is the
same
as the path of object file of ../common/src/extra_data_handler.cpp in
venc.

Bug: 12779537
Change-Id: I42bf0471451316dc61f5fafdde5bb1cf1f0218c3
(cherry picked from commit d919cadbcaabc6295c1096c0fa7fa33207fb13d2)
Move Android.mks to their parent dir.

So we don't need "../" to reference source files in the common/
directory.
"../" in LOCAL_SRC_FILES causes build race condition: the path of object
file of ../common/src/extra_data_handler.cpp in vdec actually is the same
as the path of object file of ../common/src/extra_data_handler.cpp in
venc.

Bug: 12779537
Change-Id: Ifd7fef36810c15fbe7854aeb3d505fba63f5d7e2
(cherry picked from commit c9a7bd20d3891b002f6b0285692adb9d246036ae)
Merge "Move Android.mks to their parent dir." into klp-dev
am e568499d: Move Android.mks to their parent dir.

* commit 'e568499d48c0f800a6103d2de60d3f3d8d0917ea':
  Move Android.mks to their parent dir.
am 66eadc78: Merge "Move Android.mks to their parent dir." into klp-dev

* commit '66eadc7816eb4af781b0eafe377b92e4a46e95a2':
  Move Android.mks to their parent dir.
auto-merger: merge in from aosp/master

Conflicts:
	mm-video-legacy/vidc/vdec.mk
	mm-video-legacy/vidc/venc.mk
	mm-video-v4l2/vidc/vdec.mk
	mm-video-v4l2/vidc/venc.mk