Merge "Extract android_media_Utils.cpp as a lib" am: d14d29ca8f
am: 6c7d8d31e0

Change-Id: I1b910c0aea3a78d800c2df9898d039f3e3b763ee