Merge "[RFC media]: refactoring several functions to C++ style" am: 6b602d83...

Merge "[RFC media]: refactoring several functions to C++ style" am: 6b602d83 am: e19fda14 am: 34263f36

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2528799



Change-Id: Ib123f868bf10b5c9215f529142bc0f428b1df098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>