Merge "Add JPEG/R dependencies to libandroid_runtime"