Merge "android_media_Utils: update camera_jpeg_blob definition to match aidl." into tm-dev