media: rename ion_allocation_data.heap_mask to heap_id_mask

Rename the heap_mask field in ion_allocation_data struct to heap_id_mask and
match the new kernel header.

Change-Id: Id4794c0e303a15c5815f9ee50e7b21c095e959c1
am 0b4668aa: am a44fe520: merge in release branch changes (no-op).

* commit '0b4668aa2206d57647a7eeb1744c055f86dac34a':
  mm-video: vidc: stability fixes in decoder
  mm-video: vidc: Fix codec config behavior in flush
am 81f51def: am 9051a983: mm-video: vidc:  release registered buffers from driver

* commit '81f51def069e20924520cb7d004f3ef65de6ea82':
  mm-video: vidc:  release registered buffers from driver
am 64943076: am 2e277fbe: mm-video: venc: switch between executing and loaded.

* commit '649430769e238f990ba24ebd93599d1a80a7ee82':
  mm-video: venc: switch between executing and loaded.
am 0405148d: am cf840818: mm-video: vidc: venc: add set ctrl to request sequence header

* commit '0405148deab7219f9d79ae521601c7bf29966702':
  mm-video: vidc: venc: add set ctrl to request sequence header
am 54610242: am ad7c7d38: Merge commit \'0abbfba91e781810891ac818e97a8a5a0fb6134c\' into HEAD

* commit '54610242d69872858ac746b4fda3e9d7abd476a0':
am 6c7125d4: am 56728d2c: Merge "libc2dcolorconvert: fix arithmetic on a pointer to void"

* commit '6c7125d460da60bb48d4919f77baf135b2ebdf59':
  libc2dcolorconvert: fix arithmetic on a pointer to void
am 88cfbf41: am 50ae6471: Merge commit \'0405148deab7219f9d79ae521601c7bf29966702\' into HEAD

* commit '88cfbf410b084c9eda2ac648f8fd7bca0b9c8b6d':
mm-video: venc: Set default key-frame periodicity for VP8 codec

Setting a new default key-frame periodicity; from one I-frame for
every 15 P-frames to only one I-frame at the beginning of the stream.
Applications do not expect key frames unless explicitly requesting
them.

Bug: 12035976
Change-Id: I96681cb134a20cf89a76d517a4b7eef0f5e7a732
Signed-off-by: Arun Menon <avmenon@codeaurora.org>
Signed-off-by: Jorge Solano Altamirano <jsolano@codeaurora.org>
Remove include <linux/android_pmem.h>

This file is not needed and does not exist in the uapi kernel headers.

Bug: 11559337
Change-Id: I57f10311cb70b9c3f1a03276a1b6c93d64d78691
am 8d0fbfe0: am ab973ad1: Merge "Remove include <linux/android_pmem.h>"

* commit '8d0fbfe0588ec5fc24664ebc9afa72a67c35c6b5':
  Remove include <linux/android_pmem.h>
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
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
am 1490d8ec: Merge "qcom: fix errors inside ALOGV"

* commit '1490d8ec09f3253f4a6f946d63247574c0fa0d51':
  qcom: fix errors inside ALOGV
am 35966073: am 1490d8ec: Merge "qcom: fix errors inside ALOGV"

* commit '35966073133ed77de1eeac4c147d66ed257f0609':
  qcom: fix errors inside ALOGV
am 5a9eab65: mm-video: vidc: fix memory leak in dynamic buffer mode

* commit '5a9eab657a9f229a6ed3700f27dc1253a8eaddfb':
  mm-video: vidc: fix memory leak in dynamic buffer mode
am 01053301: am 5a9eab65: mm-video: vidc: fix memory leak in dynamic buffer mode

* commit '01053301f8df5abfdbc0df702e1f04d871b045ef':
  mm-video: vidc: fix memory leak in dynamic buffer mode
am 869954ed: am 01053301: am 5a9eab65: mm-video: vidc: fix memory leak in dynamic buffer mode

* commit '869954edfcf91c252c9f3a627bbd068b6fd779f6':
  mm-video: vidc: fix memory leak in dynamic buffer mode
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.