Merge "Add NDK versions of libjpeg"